[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit e6d7b203bdac1b34715efcba440fbe3a276fa045
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 09:17:20 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
nl.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nl.po b/nl.po
index 558d8f83f..c9b1c0d6e 100644
--- a/nl.po
+++ b/nl.po
@@ -35,8 +35,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+0000\n"
-"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
+"PO-Revision-Date: 2019-10-06 09:00+0000\n"
+"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\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"
@@ -106,7 +106,7 @@ msgstr "Persistentie is uitgeschakeld voor Electrum"
msgid ""
"When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n"
"It is strongly recommended to only run Electrum when its persistence feature is activated."
-msgstr "Alle Electrum-gegevens, inclusief je Bitcoin-portemonnee zullen verloren gaan wanneer je Tails herstart.\nHet wordt ten zeerste aanbevolen om Electrum alleen uit te voeren wanneer Electrums persistentie-functie is ingeschakeld."
+msgstr "Wanneer u Tails opnieuw opstart, gaan alle gegevens van Electrum verloren, waaronder uw Bitcoin-portemonnee.\nHet wordt ten zeerste aanbevolen Electrum alleen uit te voeren wanneer de persistentiefunctie ervan is geactiveerd."
#: config/chroot_local-includes/usr/local/bin/electrum:65
msgid "Do you want to start Electrum anyway?"
1
0
[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit 07af7aa8420f49b878ad799409a0dfc889e2af1e
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 09:16:13 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
---
nl/nl.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/nl/nl.po b/nl/nl.po
index 3ca66b399..10b08173b 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -27,7 +27,7 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-14 14:48+0200\n"
-"PO-Revision-Date: 2019-10-04 18:53+0000\n"
+"PO-Revision-Date: 2019-10-06 09:08+0000\n"
"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -210,7 +210,7 @@ msgstr "%(file)s verwijderen"
#: ../tails_installer/creator.py:1186
#, python-format
msgid "%s already bootable"
-msgstr "%s is al bootable"
+msgstr "%s is al opstartbaar"
#: ../tails_installer/creator.py:1206
msgid "Unable to find partition"
@@ -238,7 +238,7 @@ msgstr "Kon het uitgepakte MBR niet lezen vanaf %(path)s"
#: ../tails_installer/creator.py:1319 ../tails_installer/creator.py:1320
#, python-format
msgid "Resetting Master Boot Record of %s"
-msgstr "Master Boot Record van %s resetten"
+msgstr "Master Boot Record van %s opnieuw instellen"
#: ../tails_installer/creator.py:1325
msgid "Drive is a loopback, skipping MBR reset"
1
0
[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit 9d369c4088b474a5321a1d5148edaba92f382142
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 03:48:21 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
tr.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tr.po b/tr.po
index 1f39550f3..334a08942 100644
--- a/tr.po
+++ b/tr.po
@@ -30,8 +30,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+0000\n"
-"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
+"PO-Revision-Date: 2019-10-06 03:31+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -101,7 +101,7 @@ msgstr "Electrum için kalıcılık devre dışı bırakıldı"
msgid ""
"When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n"
"It is strongly recommended to only run Electrum when its persistence feature is activated."
-msgstr ""
+msgstr "Tails yeniden başlatıldığında, Bitcoin cüzdanınız da dahil tüm Electrum verileri kaybolur. \nElectrum uygulamasının yalnız kalıcılık özelliği etkin iken çalıştırılması önerilir."
#: config/chroot_local-includes/usr/local/bin/electrum:65
msgid "Do you want to start Electrum anyway?"
1
0
[translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit 67cc3bd19220cb6628fc379654a5c28a71aa3f9c
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 03:47:23 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
---
tr.po | 1099 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 1099 insertions(+)
diff --git a/tr.po b/tr.po
new file mode 100644
index 000000000..334a08942
--- /dev/null
+++ b/tr.po
@@ -0,0 +1,1099 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Ayca Omrak <aycaom(a)hotmail.com>, 2013
+# Bullgeschichte <bullgeschichte(a)riseup.net>, 2015
+# Can Günay <cangunay(a)yandex.com>, 2018
+# Cenk Yıldızlı <goncagul(a)national.shitposting.agency>, 2019
+# cmldrs, 2014
+# cmldrs, 2014
+# imratirtil <d.imra.gundogdu(a)gmail.com>, 2014
+# ecocan <eecocan(a)yahoo.com>, 2014
+# ecocan <eecocan(a)yahoo.com>, 2014
+# Emma Peel, 2018
+# imratirtil <d.imra.gundogdu(a)gmail.com>, 2014
+# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2019
+# metint, 2014
+# metint, 2014
+# Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015-2016
+# Tails_developers <tails(a)boum.org>, 2014
+# Tails_developers <tails(a)boum.org>, 2014
+# T. E. Kalayci <tekrei(a)gmail.com>, 2017-2018
+# Th3Kh3d1v3, 2018
+# Ümit Türk <zucchinitr(a)gmail.com>, 2013
+# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2016
+# Yasin Özel <iletisim(a)yasinozel.com.tr>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 03:31+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
+msgid "Tor is ready"
+msgstr "Tor hazır"
+
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
+msgid "You can now access the Internet."
+msgstr "Artık İnternet'e erişebilirsiniz."
+
+#: config/chroot_local-includes/etc/whisperback/config.py:69
+#, python-format
+msgid ""
+"<h1>Help us fix your bug!</h1>\n"
+"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n"
+"<p><strong>Do not include more personal information than\n"
+"needed!</strong></p>\n"
+"<h2>About giving us an email address</h2>\n"
+"<p>\n"
+"Giving us an email address allows us to contact you to clarify the problem. This\n"
+"is needed for the vast majority of the reports we receive as most reports\n"
+"without any contact information are useless. On the other hand it also provides\n"
+"an opportunity for eavesdroppers, like your email or Internet provider, to\n"
+"confirm that you are using Tails.\n"
+"</p>\n"
+msgstr "<h1>Karşılaştığınız sorunu çözmemize yardım edin!</h1>\n<p><a href=\"%s\">Hata bildirme yönergelerini</a> okuyun.</p>\n<p><strong>Gerektiğinden fazla kişisel bilgi vermeyin!</strong></p>\n<h2>E-posta adresinizi bildirmeniz hakkında</h2>\n<p>\nBir e-posta adresi bildirmeniz, sorununuzu daha iyi anlamak için sizinle iletişim\nkurmamızı sağlar. Bize iletilen pek çok hata bildirimi, iletişim bilgileri bulunmadığı\niçin işe yaramıyor. Ancak gerçek bilgilerinizi verdiğinizde sizi izliyor olabilecek \nkişi ya da kuruluşlara (e-posta ya da İnternet hizmeti sağlayıcınıza) Tails uygulamasını kullandığınızı\nbelirleme fırsatı vermiş olursunuz. Bu nedenle farklı bir e-posta adresi kullanmanız önerilir.\n</p>\n"
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
+msgid "Additional Software"
+msgstr "Ek Yazılımlar"
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "Tails başlatılırken otomatik olarak kalıcı depolama alanınızdan ek yazılımlar kurabilirsiniz."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "Şu yazılımlar Tails başlatılırken otomatik olarak kalıcı depolama alanınızdan kurulacak."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:171
+msgid ""
+"To add more, install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a "
+"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr "Başka yazılımlar eklemek için <a href=\"synaptic.desktop\">Synaptic Paket Yöneticisi</a> ya da <a href=\"org.gnome.Terminal.desktop\">komut satırından APT kullanarak</a> başka yazılımlar kurun."
+
+#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
+msgid "_Create persistent storage"
+msgstr "_Kalıcı depolama oluştur"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:62
+msgid "Persistence is disabled for Electrum"
+msgstr "Electrum için kalıcılık devre dışı bırakıldı"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:64
+msgid ""
+"When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n"
+"It is strongly recommended to only run Electrum when its persistence feature is activated."
+msgstr "Tails yeniden başlatıldığında, Bitcoin cüzdanınız da dahil tüm Electrum verileri kaybolur. \nElectrum uygulamasının yalnız kalıcılık özelliği etkin iken çalıştırılması önerilir."
+
+#: config/chroot_local-includes/usr/local/bin/electrum:65
+msgid "Do you want to start Electrum anyway?"
+msgstr "Electrum yine de başlatılsın mı?"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:68
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
+msgid "_Launch"
+msgstr "_Başlat"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:69
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
+msgid "_Exit"
+msgstr "Çı_kış"
+
+#: 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/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: 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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ekle"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Geri"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_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/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr "_Tails Başlat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
+#, python-brace-format
+msgid ""
+"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/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{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/settings/persistence.py:160
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{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/settings/persistence.py:174
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "umount şu hata kodu ile yürütülemedi {returncode}:\n{stdout}\n{stderr}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/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/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/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Kilit açılıyor..."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_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/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
+msgid "_Language"
+msgstr "_Dil"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
+msgid "_Keyboard Layout"
+msgstr "_Tuş Takımı Düzeni"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
+msgid "_Formats"
+msgstr "_Biçimler"
+
+#: config/chroot_local-includes/usr/local/bin/keepassxc:15
+#, sh-format
+msgid ""
+"<b><big>Do you want to rename your <i>KeePassXC</i> database?</big></b>\n"
+"\n"
+"You have a <i>KeePassXC</i> database in your <i>Persistent</i> folder:\n"
+"\n"
+"<i>${filename}</i>\n"
+"\n"
+"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassXC</i> to open it automatically in the future."
+msgstr "<b><big><i>KeePassXC</i> veritabanınızı yeniden adlandırmak ister misiniz?</big></b>\n\n<i>Kalıcı</i> klasörünüzde bir <i>KeePassXC</i> veritabanı var:\n\n<i>${filename}</i>\n\nBu dosyayı <i>keepassx.kdbx</i> olarak yeniden adlandırarak gelecekte <i>KeePassXC</i> ile otomatik olarak açılmasını sağlayabilirsiniz."
+
+#: config/chroot_local-includes/usr/local/bin/keepassxc:23
+msgid "Rename"
+msgstr "Yeniden Adlandır"
+
+#: config/chroot_local-includes/usr/local/bin/keepassxc:24
+msgid "Keep current name"
+msgstr "Geçerli ad korunsun"
+
+#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21
+msgid "su is disabled. Please use sudo instead."
+msgstr " su komutu devre dışı bırakılmış. Lütfen yerine sudo komutunu kullanın."
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75
+msgid "Lock screen"
+msgstr "Ekranı kilitle"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:79
+msgid "Suspend"
+msgstr "Duraklat"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:83
+msgid "Restart"
+msgstr "Yeniden başlat"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:87
+msgid "Power Off"
+msgstr "Gücü Kapat"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:22
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1
+msgid "Tails"
+msgstr "Tails"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:25
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:1
+msgid "About Tails"
+msgstr "Tails Hakkında"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:35
+msgid "The Amnesic Incognito Live System"
+msgstr "The Amnesic Incognito Live System"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:36
+#, python-format
+msgid ""
+"Build information:\n"
+"%s"
+msgstr "Yapım bilgisi:\n%s"
+
+#: config/chroot_local-includes/usr/local/bin/tails-about:54
+msgid "not available"
+msgstr "kullanılamıyor"
+
+#. Translators: Don't translate {details}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:148
+#, python-brace-format
+msgid ""
+"{details} Please check your list of additional software or read the system "
+"log to understand the problem."
+msgstr "{details} Lütfen ek yazılım listenizi denetleyin ya da sorunu anlamak için sistem günlüğüne bakın."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153
+msgid ""
+"Please check your list of additional software or read the system log to "
+"understand the problem."
+msgstr "Lütfen ek yazılım listenizi denetleyin ya da sorunu anlamak için sistem günlüğüne bakın."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
+msgid "Show Log"
+msgstr "Günlüğü Görüntüle"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157
+msgid "Configure"
+msgstr "Yapılandır"
+
+#. Translators: Don't translate {beginning} or {last}, they are
+#. placeholders and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:223
+#, python-brace-format
+msgid "{beginning} and {last}"
+msgstr "{beginning} ile {last}"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:224
+msgid ", "
+msgstr ", "
+
+#. Translators: Don't translate {packages}, it's a placeholder and will
+#. be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:290
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320
+#, python-brace-format
+msgid "Add {packages} to your additional software?"
+msgstr "Ek yazılımlarına {packages} eklensin mi?"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:292
+msgid ""
+"To install it automatically from your persistent storage when starting "
+"Tails."
+msgstr "Tails başlatılırken otomatik olarak kalıcı depolama alanınızdan kurmak için."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:294
+msgid "Install Every Time"
+msgstr "Her Defasında Kurulsun"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:295
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:326
+msgid "Install Only Once"
+msgstr "Yalnız Bir Kez Kurulsun"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:301
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:331
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:372
+msgid "The configuration of your additional software failed."
+msgstr "Ek yazılımınız yapılandırılamadı."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:322
+msgid ""
+"To install it automatically when starting Tails, you can create a persistent"
+" storage and activate the <b>Additional Software</b> feature."
+msgstr "Tails başlatılırken otomatik olarak kurulması için bir kalıcı depolama oluşturarak <b>Ek Yazılımlar</b> özelliğini etkinleştirmeniz gerekir."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:325
+msgid "Create Persistent Storage"
+msgstr "Kalıcı Depolama Oluştur"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:333
+msgid "Creating your persistent storage failed."
+msgstr "Kalıcı depolamanız oluşturulamadı."
+
+#. Translators: Don't translate {packages}, it's a placeholder and
+#. will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:342
+#, python-brace-format
+msgid "You could install {packages} automatically when starting Tails"
+msgstr "Tails başlatılırken otomatik olarak {packages} kurabilirsiniz"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345
+msgid ""
+"To do so, you need to run Tails from a USB stick installed using <i>Tails "
+"Installer</i>."
+msgstr "Bunun için Tails uygulamasını <i>Tails Kurucu</i> ile hazırlanmış bir USB bellekten çalıştırmalısınız."
+
+#. Translators: Don't translate {packages}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:360
+#, python-brace-format
+msgid "Remove {packages} from your additional software?"
+msgstr "{packages} ek yazılımlarınızdan kaldırılsın mı?"
+
+#. Translators: Don't translate {packages}, it's a placeholder
+#. and will be replaced.
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:364
+#, python-brace-format
+msgid "This will stop installing {packages} automatically."
+msgstr "Bu işlem otomatik {packages} kurulumunu durduracak."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:154
+msgid "Remove"
+msgstr "Kaldır"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:545
+msgid "Installing your additional software from persistent storage..."
+msgstr "Ek yazılımınız kalıcı depolama alanınızdan kuruluyor..."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:547
+msgid "This can take several minutes."
+msgstr "Bu işlem bir kaç dakika sürebilir."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:560
+msgid "The installation of your additional software failed"
+msgstr "Ek yazılım kurulamadı"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:575
+msgid "Additional software installed successfully"
+msgstr "Ek yazılım kuruldu"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:595
+msgid "The check for upgrades of your additional software failed"
+msgstr "Ek yazılımınızın güncellemeleri denetlenemedi"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:597
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:605
+msgid ""
+"Please check your network connection, restart Tails, or read the system log "
+"to understand the problem."
+msgstr "Lütfen ağ bağlantınızı denetleyin, Tails uygulamasını yeniden başlatın ya da sorunu anlamak için sistem günlüğüne bakın."
+
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:604
+msgid "The upgrade of your additional software failed"
+msgstr "Ek yazılım güncellenemedi"
+
+#: config/chroot_local-includes/usr/local/lib/tails-additional-software-notify:37
+msgid "Documentation"
+msgstr "Belgeler"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:94
+#, python-brace-format
+msgid ""
+"Remove {package} from your additional software? This will stop installing "
+"the package automatically."
+msgstr "{package} ek yazılımlarınız arasından kaldırılsın mı? Bu işlem paketin otomatik olarak kurulmasını durduracak."
+
+#. Translators: Don't translate {pkg}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:105
+#, python-brace-format
+msgid "Failed to remove {pkg}"
+msgstr "{pkg} kaldırılamadı"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:122
+msgid "Failed to read additional software configuration"
+msgstr "Ek yazılım yapılandırması okunamadı"
+
+#. Translators: Don't translate {package}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:152
+#, python-brace-format
+msgid "Stop installing {package} automatically"
+msgstr "{package} otomatik olarak kurulmasın"
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:178
+msgid ""
+"To do so, install some software using <a href=\"synaptic.desktop\">Synaptic "
+"Package Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the "
+"command line</a>."
+msgstr "Bunun için <a href=\"synaptic.desktop\">Synaptic Paket Yöneticisi</a> ya da <a href=\"org.gnome.Terminal.desktop\">komut satırından APT kullanarak</a> başka yazılımlar kurun."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:187
+msgid ""
+"To do so, unlock your persistent storage when starting Tails and install "
+"some software using <a href=\"synaptic.desktop\">Synaptic Package "
+"Manager</a> or <a href=\"org.gnome.Terminal.desktop\">APT on the command "
+"line</a>."
+msgstr "Bunun için Tails uygulamasını başlatırken kalıcı deponuzun kilidini açın ve <a href=\"synaptic.desktop\">Synaptic Paket Yöneticisi</a> ya da <a href=\"org.gnome.Terminal.desktop\">komut satırından APT kullanarak</a> başka yazılımlar kurun."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:197
+msgid ""
+"To do so, create a persistent storage and install some software using <a "
+"href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a "
+"href=\"org.gnome.Terminal.desktop\">APT on the command line</a>."
+msgstr "Bunun için, kalıcı bir depo ekleyin ve <a href=\"synaptic.desktop\">Synaptic Paket Yöneticisi</a> ya da <a href=\"org.gnome.Terminal.desktop\">komut satırından APT kullanarak</a> başka yazılımlar kurun."
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:205
+msgid ""
+"To do so, install Tails on a USB stick using <a href=\"tails-"
+"installer.desktop\">Tails Installer</a> and create a persistent storage."
+msgstr "Bunun için <a href=\"tails-installer.desktop\">Tails Kurucu </a>uygulamasını kullanarak bir Tails uygulamasını bir USB belleğe kurun ve kalıcı bir depo ekleyin. "
+
+#: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:252
+msgid "[package not available]"
+msgstr "[paket kullanılamıyor]"
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52
+msgid "Synchronizing the system's clock"
+msgstr "Sistem saati eşitleniyor "
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53
+msgid ""
+"Tor needs an accurate clock to work properly, especially for Hidden "
+"Services. Please wait..."
+msgstr "Tor uygulamasının düzgün çalışabilmesi için saatin doğru olması önemlidir, özellikle Gizli Servisler için. Lütfen bekleyin..."
+
+#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87
+msgid "Failed to synchronize the clock!"
+msgstr "Saat eşitlenemedi!"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110
+msgid "Lock Screen"
+msgstr "Ekranı Kilitle"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125
+msgid "Screen Locker"
+msgstr "Ekran Kilitleyici"
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131
+msgid "Set up a password to unlock the screen."
+msgstr "Ekran kilidini açmak için bir parola ayarlayın."
+
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:149
+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: "
+
+#: config/chroot_local-includes/usr/local/bin/tails-security-check:135
+msgid "Known security issues"
+msgstr "Bilinen güvenlik sorunları"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#, sh-format
+msgid "Network card ${nic} disabled"
+msgstr "${nic} ağ kartı devre dışı"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
+#, sh-format
+msgid ""
+"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n"
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr "${nic_name} (${nic}) ağ kartı için MAC maskelemesi başarısız bu yüzden geçici olarak devre dışı bırakıldı.\nTails'i yeniden başlatmanız ve MAC maskelemesini kapatmanız gerekebilir."
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
+msgid "All networking disabled"
+msgstr "Tüm ağ devre dışı"
+
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63
+#, sh-format
+msgid ""
+"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n"
+"You might prefer to restart Tails and disable MAC spoofing."
+msgstr "${nic_name} (${nic}) ağ kartı için MAC maskelemesi başarısız. Ayrıca bu hatanın kurtarılma girişimi de başarısız dolayısıyla tüm ağ devre dışı.\nTails uygulamasını yeniden başlatmanız ve MAC maskelemesini kapatmanız gerekebilir."
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35
+msgid ""
+"\"<b>Not enough memory available to check for upgrades.</b>\n"
+"\n"
+"Make sure this system satisfies the requirements for running Tails.\n"
+"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n"
+"\n"
+"Try to restart Tails to check for upgrades again.\n"
+"\n"
+"Or do a manual upgrade.\n"
+"See https://tails.boum.org/doc/first_steps/upgrade#manual\""
+msgstr "\"<b>Güncellemeleri denetlemek için yeterli bellek yok.</b>\n\nSistemin Tails uygulamasını çalıştırmak için gereksinimleri karşıladığından emin olun.\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.html dosyasına bakabilirsiniz\n\nGüncellemeleri yeniden denetlemek için Tails uygulamasını yeniden başlatmayı deneyin.\n\nYa da el ile güncellemeyi deneyin.\nAyrıntılı bilgi almak için https://tails.boum.org/doc/first_steps/upgrade#manual\" adresine bakabilirsiniz"
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:72
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
+msgid "error:"
+msgstr "hata:"
+
+#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
+msgid "Error"
+msgstr "Hata"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:71
+msgid "Warning: virtual machine detected!"
+msgstr "Uyarı: Sanal makine algılandı!"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74
+msgid "Warning: non-free virtual machine detected!"
+msgstr "Uyarı: Özgür olmayan sanal makine algılandı!"
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:77
+msgid ""
+"Both the host operating system and the virtualization software are able to "
+"monitor what you are doing in Tails. Only free software can be considered "
+"trustworthy, for both the host operating system and the virtualization "
+"software."
+msgstr "Sunucu işletim sistemi ve sanallaştırma uygulaması Tails üzerinde yaptığınız işlemleri izler. Sunucu işletim sistemi ve sanallaştırma uygulaması için yalnızca özgür yazılımlar güvenilir olarak düşünülebilir."
+
+#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:81
+msgid "Learn more"
+msgstr "Ayrıntılı bilgi alın"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:43
+msgid "Tor is not ready"
+msgstr "Tor hazır değil"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:44
+msgid "Tor is not ready. Start Tor Browser anyway?"
+msgstr "Tor hazır değil. Gene de Tor Browser başlatılsın mı?"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:45
+msgid "Start Tor Browser"
+msgstr "Tor Browser Başlatılsın"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:35
+msgid "Tor Status"
+msgstr "Tor Durumu"
+
+#: config/chroot_local-includes/usr/share/gnome-shell/extensions/torstatus@tails.boum.org/extension.js:50
+msgid "Open Onion Circuits"
+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: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: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: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: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:121
+#, python-brace-format
+msgid "{partition_name} in {container_path}"
+msgstr "{container_path} içindeki {partition_name}"
+
+#. Translators: Don't translate {volume_name} and {path_to_file_container},
+#. they are placeholders and will be replaced. You should only have to
+#. translate
+#. this string if it makes sense to reverse the order of the placeholders.
+#: config/chroot_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:134
+#, python-brace-format
+msgid "{partition_name} on {drive_name}"
+msgstr "{drive_name} üzerindeki {partition_name}"
+
+#. Translators: Don't translate {volume_name} and {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: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: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: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: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: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: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:344
+msgid "Locking the volume failed"
+msgstr "Birim kilitlenemedi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83
+msgid "No file containers added"
+msgstr "Herhangi bir dosya kapsayıcısı eklenmedi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:98
+msgid "No VeraCrypt devices detected"
+msgstr "Herhangi bir VeraCrypt aygıtı algılanamadı"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:40
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:1
+msgid "Unlock VeraCrypt Volumes"
+msgstr "VeraCrypt Birimlerinin Kilidini Aç"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:114
+msgid "Container already added"
+msgstr "Kapsayıcı zaten eklenmiş"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:115
+#, python-format
+msgid "The file container %s should already be listed."
+msgstr "%s kapsayıcısının zaten listede olması gerekir."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:131
+msgid "Container opened read-only"
+msgstr "Kapsayıcı salt okunur olarak açıldı"
+
+#. Translators: Don't translate {path}, it's a placeholder and will be
+#. replaced.
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:133
+#, python-brace-format
+msgid ""
+"The file container {path} could not be opened with write access. It was opened read-only instead. You will not be able to modify the content of the container.\n"
+"{error_message}"
+msgstr "{path} dosya kapsayıcısı yazma izinleri ile açılamadı. Bu nedenle salt okunur olarak açıldı. Kapsayıcının içeriğini değiştiremeyeceksiniz.\n{error_message}"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:138
+msgid "Error opening file"
+msgstr "Dosya açılırken sorun çıktı"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:160
+msgid "Not a VeraCrypt container"
+msgstr "Bir VeraCrypt kapsayıcısı değil"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:161
+#, python-format
+msgid "The file %s does not seem to be a VeraCrypt container."
+msgstr "%s dosyası bir VeraCrypt kapsayıcısı gibi görünmüyor."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:163
+msgid "Failed to add container"
+msgstr "Kapsayıcı eklenemedi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:164
+#, python-format
+msgid ""
+"Could not add file container %s: Timeout while waiting for loop setup.\n"
+"Please try using the <i>Disks</i> application instead."
+msgstr "%s dosya kapsayıcısı eklenemedi: Çevrim kurulumu beklenirken zaman aşımı oluştu.\nLütfen bunun yerine <i>Diskler</i> uygulamasını kullanmayı deneyin."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209
+msgid "Choose File Container"
+msgstr "Dosya Kapsayıcısını Seçin"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
+msgid "Do you really want to launch the Unsafe Browser?"
+msgstr "Güvenli Olmayan Tarayıcıyı başlatmak istediğinize emin misiniz?"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
+msgid ""
+"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
+"use the Unsafe Browser if necessary, for example\\nif you have to login or "
+"register to activate your Internet connection."
+msgstr "Güvensiz Tarayıcı ile ağ etkinlikleriniz <b>anonim değildir</b>.\\nGüvensiz Tarayıcıyı yalnızca kullanmanız gerekiyorsa, örneğin\\nİnternet bağlantınızı etkinleştirmek için kaydolmanız ya da oturum açmanız gerekiyorsa kullanın."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
+msgid "Starting the Unsafe Browser..."
+msgstr "Güvenli Olmayan Tarayıcı başlatılıyor..."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
+msgid "This may take a while, so please be patient."
+msgstr "Bu işlem biraz zaman alabilir, lütfen sabırlı olun."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
+msgid "Shutting down the Unsafe Browser..."
+msgstr "Güvenli Olmayan Tarayıcı kapatılıyor..."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
+msgid ""
+"This may take a while, and you may not restart the Unsafe Browser until it "
+"is properly shut down."
+msgstr "Bu işlem biraz zaman alabilir. Güvenli Olmayan Tarayıcı düzgün kapatılmadan yeniden başlatamayabilirsiniz."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
+msgid "Failed to restart Tor."
+msgstr "Tor yeniden başlatılamadı."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
+msgid "Unsafe Browser"
+msgstr "Güvenli Olmayan Tarayıcı"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91
+msgid ""
+"Another Unsafe Browser is currently running, or being cleaned up. Please "
+"retry in a while."
+msgstr "Şu anda başka bir Güvenli Olmayan Tarayıcı çalışıyor ya da temizleniyor. Lütfen bir süre sonra yeniden deneyin."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99
+msgid "Failed to setup chroot."
+msgstr "chroot kurulamadı."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104
+msgid "Failed to configure browser."
+msgstr "Tarayıcıyı ayarlanamadı."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110
+msgid ""
+"No DNS server was obtained through DHCP or manually configured in "
+"NetworkManager."
+msgstr "DHCP aracılığıyla bir DNS sunucusu bulunamadı ya da AğYöneticisi içinde el ile ayarlanmış."
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121
+msgid "Failed to run browser."
+msgstr "Tarayıcıyı çalıştırılamadı."
+
+#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
+msgid "Report an error"
+msgstr "Hata bildirin"
+
+#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1
+#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1
+msgid "Tails documentation"
+msgstr "Tails belgeleri"
+
+#: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:1
+msgid "Root Terminal"
+msgstr "Root Uçbirimi"
+
+#: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:2
+msgid "Opens a terminal as the root user, using gksu to ask for the password"
+msgstr "Uçbirimi root kullanıcı ile açar. Parola sormak için gksu kullanır"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
+msgid "Learn how to use Tails"
+msgstr "Tails uygulamasını nasıl kullanacağınızı öğrenin"
+
+#: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
+msgid "Learn more about Tails"
+msgstr "Tails hakkında ayrıntılı bilgi alın"
+
+#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
+msgid "Tor Browser"
+msgstr "Tor Browser"
+
+#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
+msgid "Anonymous Web Browser"
+msgstr "Anonim Web Tarayıcısı"
+
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2
+msgid "Browse the World Wide Web without anonymity"
+msgstr "Web üzerinde anonim olmadan gez"
+
+#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:3
+msgid "Unsafe Web Browser"
+msgstr "Güvenli Olmayan Tarayıcı"
+
+#: ../config/chroot_local-includes/usr/share/applications/unlock-veracrypt-volumes.desktop.in.h:2
+msgid "Mount VeraCrypt encrypted file containers and devices"
+msgstr "VeraCrypt ile şifrelenmiş dosya kapsayıcı ve aygıtlarını bağla"
+
+#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:2
+msgid ""
+"Configure the additional software installed from your persistent storage "
+"when starting Tails"
+msgstr "Tails başlatılırken otomatik olarak kalıcı depolama alanınızdan kurulacak ek yazılımları yapılandırın."
+
+#: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
+msgid "Tails specific tools"
+msgstr "Özel Tails araçları"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.root-terminal.policy.in.h:1
+msgid "To start a Root Terminal, you need to authenticate."
+msgstr "Bir Root Uç Birimi başlatmak için kimliğinizi doğrulamalısınız."
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:1
+msgid "Remove an additional software package"
+msgstr "Bir ek yazılım paketini kaldır"
+
+#: ../config/chroot_local-includes/usr/share/polkit-1/actions/org.boum.tails.additional-software.policy.in.h:2
+msgid ""
+"Authentication is required to remove a package from your additional software"
+" ($(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ı"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:80
+msgid "_Add"
+msgstr "_Ekle"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:86
+msgid "Add a file container"
+msgstr "Bir dosya kapsayıcısı ekle"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:103
+msgid "Partitions and Drives"
+msgstr "Bölüm ve Sürücüler"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:121
+msgid ""
+"This application is not affiliated with or endorsed by the VeraCrypt project"
+" or IDRIX."
+msgstr "Bu uygulamanın VeraCrypt ya da IDRIX ile herhangi bir bağlantısı ve onlardan alınmış bir parçası yoktur."
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:29
+msgid "_Open"
+msgstr "_Aç"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:38
+msgid "Lock this volume"
+msgstr "Bu birimi kilitle"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:52
+msgid "_Unlock"
+msgstr "_Engellemeyi Kaldır"
+
+#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/volume.ui.in:61
+msgid "Detach this volume"
+msgstr "Bu birimin bağlantısını kes"
+
+#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
+msgid "TrueCrypt/VeraCrypt container"
+msgstr "TrueCrypt/VeraCrypt kapsayıcısı"
1
0
[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit 97c40df12c860f3e7ab9f6f572018be740ae44ff
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 03:47:16 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
tr.po | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tr.po b/tr.po
index 1f39550f3..334a08942 100644
--- a/tr.po
+++ b/tr.po
@@ -30,8 +30,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-05 16:50+0200\n"
-"PO-Revision-Date: 2019-10-06 02:05+0000\n"
-"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
+"PO-Revision-Date: 2019-10-06 03:31+0000\n"
+"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -101,7 +101,7 @@ msgstr "Electrum için kalıcılık devre dışı bırakıldı"
msgid ""
"When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n"
"It is strongly recommended to only run Electrum when its persistence feature is activated."
-msgstr ""
+msgstr "Tails yeniden başlatıldığında, Bitcoin cüzdanınız da dahil tüm Electrum verileri kaybolur. \nElectrum uygulamasının yalnız kalıcılık özelliği etkin iken çalıştırılması önerilir."
#: config/chroot_local-includes/usr/local/bin/electrum:65
msgid "Do you want to start Electrum anyway?"
1
0
[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit edfc084d44c82f0587bca5a502c917a44a0a3f02
Author: Translation commit bot <translation(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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 ""
1
0
[translation/tails-misc_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit 2f40f0d492667e185c1868a6496ff8e717d0f464
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 02:18:17 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_completed
---
tails.pot | 463 +++++++++++++++++++++++++++-----------------------------------
1 file changed, 203 insertions(+), 260 deletions(-)
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(a)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 ""
1
0
[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 06 Oct '19
by translation＠torproject.org 06 Oct '19
06 Oct '19
commit 6013c3481012f6042f05ace651fe3f8f6806658c
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Oct 6 02:18:10 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
ach.po | 463 ++++++++++++++++++++++++++--------------------------------
af.po | 465 ++++++++++++++++++++++++++---------------------------------
ar.po | 485 +++++++++++++++++++++++++++----------------------------------
ast.po | 469 ++++++++++++++++++++++++++---------------------------------
az.po | 473 +++++++++++++++++++++++++++---------------------------------
be.po | 469 ++++++++++++++++++++++++++---------------------------------
bg.po | 485 +++++++++++++++++++++++++++----------------------------------
bn.po | 485 +++++++++++++++++++++++++++----------------------------------
br.po | 469 ++++++++++++++++++++++++++---------------------------------
bs.po | 473 +++++++++++++++++++++++++++---------------------------------
ca.po | 485 +++++++++++++++++++++++++++----------------------------------
cs.po | 485 +++++++++++++++++++++++++++----------------------------------
cy.po | 469 ++++++++++++++++++++++++++---------------------------------
da.po | 485 +++++++++++++++++++++++++++----------------------------------
de.po | 485 +++++++++++++++++++++++++++----------------------------------
el.po | 485 +++++++++++++++++++++++++++----------------------------------
en_GB.po | 485 +++++++++++++++++++++++++++----------------------------------
eo.po | 469 ++++++++++++++++++++++++++---------------------------------
es.po | 487 +++++++++++++++++++++++++++-----------------------------------
es_AR.po | 485 +++++++++++++++++++++++++++----------------------------------
es_MX.po | 485 +++++++++++++++++++++++++++----------------------------------
et.po | 473 +++++++++++++++++++++++++++---------------------------------
eu.po | 481 +++++++++++++++++++++++++++----------------------------------
fa.po | 485 +++++++++++++++++++++++++++----------------------------------
fi.po | 483 +++++++++++++++++++++++++++----------------------------------
fr.po | 485 +++++++++++++++++++++++++++----------------------------------
fy.po | 465 ++++++++++++++++++++++++++---------------------------------
ga.po | 485 +++++++++++++++++++++++++++----------------------------------
gd.po | 463 ++++++++++++++++++++++++++--------------------------------
gl.po | 479 +++++++++++++++++++++++++++---------------------------------
gu.po | 481 +++++++++++++++++++++++++++----------------------------------
he.po | 485 +++++++++++++++++++++++++++----------------------------------
hi.po | 483 +++++++++++++++++++++++++++----------------------------------
hr.po | 485 +++++++++++++++++++++++++++----------------------------------
hu.po | 485 +++++++++++++++++++++++++++----------------------------------
hy.po | 469 ++++++++++++++++++++++++++---------------------------------
id.po | 485 +++++++++++++++++++++++++++----------------------------------
is.po | 485 +++++++++++++++++++++++++++----------------------------------
it.po | 485 +++++++++++++++++++++++++++----------------------------------
ja.po | 485 +++++++++++++++++++++++++++----------------------------------
ka.po | 485 +++++++++++++++++++++++++++----------------------------------
kab.po | 463 ++++++++++++++++++++++++++--------------------------------
kk.po | 467 ++++++++++++++++++++++++++---------------------------------
km.po | 473 +++++++++++++++++++++++++++---------------------------------
kn.po | 465 ++++++++++++++++++++++++++---------------------------------
ko.po | 485 +++++++++++++++++++++++++++----------------------------------
lt.po | 487 +++++++++++++++++++++++++++-----------------------------------
lv.po | 485 +++++++++++++++++++++++++++----------------------------------
mk.po | 485 +++++++++++++++++++++++++++----------------------------------
ml.po | 469 ++++++++++++++++++++++++++---------------------------------
mr.po | 467 ++++++++++++++++++++++++++---------------------------------
ms_MY.po | 485 +++++++++++++++++++++++++++----------------------------------
my.po | 473 +++++++++++++++++++++++++++---------------------------------
nb.po | 485 +++++++++++++++++++++++++++----------------------------------
ne.po | 465 ++++++++++++++++++++++++++---------------------------------
nl.po | 487 +++++++++++++++++++++++++++-----------------------------------
nl_BE.po | 481 +++++++++++++++++++++++++++----------------------------------
nn.po | 481 +++++++++++++++++++++++++++----------------------------------
oc.po | 473 +++++++++++++++++++++++++++---------------------------------
or.po | 465 ++++++++++++++++++++++++++---------------------------------
pa.po | 467 ++++++++++++++++++++++++++---------------------------------
pl.po | 485 +++++++++++++++++++++++++++----------------------------------
pt_BR.po | 485 +++++++++++++++++++++++++++----------------------------------
pt_PT.po | 485 +++++++++++++++++++++++++++----------------------------------
ro.po | 485 +++++++++++++++++++++++++++----------------------------------
ru.po | 485 +++++++++++++++++++++++++++----------------------------------
si_LK.po | 473 +++++++++++++++++++++++++++---------------------------------
sk.po | 485 +++++++++++++++++++++++++++----------------------------------
sl.po | 473 +++++++++++++++++++++++++++---------------------------------
son.po | 465 ++++++++++++++++++++++++++---------------------------------
sq.po | 479 +++++++++++++++++++++++++++---------------------------------
sr.po | 483 +++++++++++++++++++++++++++----------------------------------
sv.po | 485 +++++++++++++++++++++++++++----------------------------------
sw.po | 469 ++++++++++++++++++++++++++---------------------------------
ta.po | 469 ++++++++++++++++++++++++++---------------------------------
tails.pot | 485 +++++++++++++++++++++++++++----------------------------------
te.po | 467 ++++++++++++++++++++++++++---------------------------------
th.po | 481 +++++++++++++++++++++++++++----------------------------------
tr.po | 485 +++++++++++++++++++++++++++----------------------------------
uk.po | 485 +++++++++++++++++++++++++++----------------------------------
ur.po | 473 +++++++++++++++++++++++++++---------------------------------
uz.po | 467 ++++++++++++++++++++++++++---------------------------------
vi.po | 485 +++++++++++++++++++++++++++----------------------------------
zh_CN.po | 485 +++++++++++++++++++++++++++----------------------------------
zh_HK.po | 473 +++++++++++++++++++++++++++---------------------------------
zh_TW.po | 485 +++++++++++++++++++++++++++----------------------------------
86 files changed, 18118 insertions(+), 23020 deletions(-)
diff --git a/ach.po b/ach.po
index 5fd6e41ff..1291130b6 100644
--- a/ach.po
+++ b/ach.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 143a098b4..1d66bfaf9 100644
--- a/af.po
+++ b/af.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Kanselleer"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Kanselleer"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ar.po b/ar.po
index 58823990a..e7fed089b 100644
--- a/ar.po
+++ b/ar.po
@@ -31,8 +31,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "مباشر (إفتراضي)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "الجسر و وكيل البروكسي"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "غير متصل"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "إلغاء القفل"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "فشل اعادة قفل التخزين الدائم."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "جار إلغاء القفل ..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "تعذر فك قفل مساحة التخزين المعماة بواسطة هذه العبارة السرية."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "إعدادات إضافية"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "إلغاء"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "إضافة"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "السابق"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "كلمة السر للأدمن"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "خدعة عنوان MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "الاتصال بالشبكة"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "مباشر (إفتراضي)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "الجسر و وكيل البروكسي"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "غير متصل"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "مشغل (إفتراضي)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "تشغيل"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "إيقاف التشغيل"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "معطل (إفتراضي)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "أغلق المتصفح"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "ابدأ تيلز"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "الافتراضي:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "فشل live-persist برمز العودة {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -200,7 +202,7 @@ msgid ""
"{stderr}"
msgstr "فشل cryptsetup برمز العودة {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
"{stderr}"
msgstr "فشل live-persist برمز العودة {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -216,225 +218,37 @@ msgid ""
"{stderr}"
msgstr "فشل الغاء التحميل برمز العودة {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "كلمة السرّ الإدارية"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "قم بإعداد كلمة سرّ إداريّة إذا أردت القيام بمهمّات إداريّة , عدا ذلك , ستكون كلمة السرّ الإداريّة معطّلة لحماية افضل."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "قم بادخال كلمة سر إداريّة"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "تأكيد "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "أكّد كلمة السرّ الإداريّة الخاصّة بك "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "إلغاء"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "تخفي كنظام تشغيل ويندوز"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "هذه الخاصية ستجعل مظهر تيلز يبدو مثل نظام مايكروسوفت ويندوز 10. قد يكون هذا مفيدا في الأماكن العامة حتى لا يثير الشبهات."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "تمويه نظام تشغيل Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "إنتحال عنوان الـ MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "تُخفي خاصية تغيير العنوان MAC الرقم التسلسلي لواجهة شبكتك ( لاسلكية أو سلكية ) عن الشبكة المحلية . تغيير عناوين MAC خاصية آمنة عموماً حيث أنها تساعدك بإخفاء موقعك الجغرافي ، ولكنها قد تخلق مشاكل بالاتصال أو تثير الشكوك ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "تمويه كل عناوين MAC ( الافتراضي )"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "لا تقم بالإنتحال المحاكي لعناوين الـ MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "ستقوم بتعيين جسور Tor والوكيل المحلي لاحقاً بعد الاتصال بالشبكة ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "مرحبا بك إلى تايلز !"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "كي يتم إرشادك خلال إعدادات تيلز ، اضغط علي <b> وانطلق بجولة </b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "إلغاء القفل"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "اللغة و المنطقة"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "فشل اعادة قفل التخزين الدائم."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "الإعدادات الإفتراضية"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "جار إلغاء القفل ..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "حفظ إعدادات اللغة و المنطقة"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "تعذر فك قفل مساحة التخزين المعماة بواسطة هذه العبارة السرية."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_اللغة"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_نسق لوحة المفاتيح"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_الصيغ"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_النطاق الزمني"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "الذاكرة المستديمة مشفرة"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "عرض العبارة السرية"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "إعداد التخزين الدائم"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "قم بإدخال عبارتك السرية لفك قفل مساحة التخزين الدائم"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "إقفال حيز التخزين الدائم"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "إنّ حيّز التخزين الدائم الخاص بك غير مقفل. قم بإعادة تشغيل تايلز قصد قفله مجددا."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "إعدادات إضافية"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "حفظ الإعدادات الإضافية"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "إضافة إعداد إضافي"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "إعدادات الشبكة"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "إذا كان الاتصال بالشبكة مراقب ، مصفي ، أو تحت البروكسي اضبط جسر Tor أو وكيل محلي . يمكنك تعطيل جميع الاتصالات للشبكة للعمل بخفاء ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "الإتصال المباشر بشبكة تور (إفتراضي)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "إعداد جسر تور أو وكيل بروكسي محلي"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "عطل جميع الشبكات"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "إن الإعدادات الإفتراضية آمنة في معظم الحالات. إن أردت إضافة ميزة خاصة، إضغط على زر \"+\" أدناه."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "كلمة السر للأدمن"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "معطل (إفتراضي)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "خدعة عنوان MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "مشغل (إفتراضي)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "الاتصال بالشبكة"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "تمويه _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "تشغيل"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "إيقاف التشغيل"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -733,6 +547,11 @@ msgstr "قم باعداد كلمة مرور لالغاء قفل الشاشة"
msgid "Password"
msgstr "كلمة السر"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "تأكيد "
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "هذه النسخة من تيلز تحتوي مشاكل أمنية:"
@@ -829,35 +648,35 @@ msgstr "افتح دوائر البصلة"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} حجم"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name}(للقراءة-فقط)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} في {container_path}"
@@ -866,14 +685,14 @@ msgstr "{partition_name} في {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} على {drive_name}"
@@ -882,42 +701,42 @@ msgstr "{partition_name} على {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "خطأ في كلمة المرور او العوامل"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "خطأ في فك قفل الحجم"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "فشل فك قفل الحجم {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "لم يستطع قفل وحدة التخزين {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1115,6 +934,130 @@ msgid ""
" ($(command_line))"
msgstr "التوثيق مطلوب لازالة حزمة من برامجك الاضافية ($(سطر_الأوامر))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "كلمة السرّ الإدارية"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "قم بإعداد كلمة سرّ إداريّة إذا أردت القيام بمهمّات إداريّة , عدا ذلك , ستكون كلمة السرّ الإداريّة معطّلة لحماية افضل."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "قم بادخال كلمة سر إداريّة"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "أكّد كلمة السرّ الإداريّة الخاصّة بك "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "إلغاء"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "إنتحال عنوان الـ MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "تُخفي خاصية تغيير العنوان MAC الرقم التسلسلي لواجهة شبكتك ( لاسلكية أو سلكية ) عن الشبكة المحلية . تغيير عناوين MAC خاصية آمنة عموماً حيث أنها تساعدك بإخفاء موقعك الجغرافي ، ولكنها قد تخلق مشاكل بالاتصال أو تثير الشكوك ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "تمويه كل عناوين MAC ( الافتراضي )"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "لا تقم بالإنتحال المحاكي لعناوين الـ MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "إعدادات الشبكة"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "إذا كان الاتصال بالشبكة مراقب ، مصفي ، أو تحت البروكسي اضبط جسر Tor أو وكيل محلي . يمكنك تعطيل جميع الاتصالات للشبكة للعمل بخفاء ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "الإتصال المباشر بشبكة تور (إفتراضي)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "إعداد جسر تور أو وكيل بروكسي محلي"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "عطل جميع الشبكات"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "ستقوم بتعيين جسور Tor والوكيل المحلي لاحقاً بعد الاتصال بالشبكة ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "مرحبا بك إلى تايلز !"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "اللغة و المنطقة"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "الإعدادات الإفتراضية"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "الذاكرة المستديمة مشفرة"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "إعداد التخزين الدائم"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "قم بإدخال عبارتك السرية لفك قفل مساحة التخزين الدائم"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "إقفال حيز التخزين الدائم"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "إنّ حيّز التخزين الدائم الخاص بك غير مقفل. قم بإعادة تشغيل تايلز قصد قفله مجددا."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "إعدادات إضافية"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "إضافة إعداد إضافي"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "إن الإعدادات الإفتراضية آمنة في معظم الحالات. إن أردت إضافة ميزة خاصة، إضغط على زر \"+\" أدناه."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "مستوعبات الملفات"
diff --git a/ast.po b/ast.po
index 67bc2710e..80704958e 100644
--- a/ast.po
+++ b/ast.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Amestar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Sin conexón"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Sin conexón"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Amestar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "Contraseña"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/az.po b/az.po
index 9e57f2f71..4f8eb8615 100644
--- a/az.po
+++ b/az.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Başlat"
msgid "_Exit"
msgstr "_Çıxış"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Ləğv et"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Əlavə et"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Geri"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Ləğv et"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Əlavə et"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Geri"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Söndür"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Təsdiqlə"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Söndür"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Bütün şəbəkəni söndür"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Parol"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Təsdiqlə"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tails-in bu versiyasının bilinən təhlükəsizlik problemləri var:"
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Söndür"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Bütün şəbəkəni söndür"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/be.po b/be.po
index 0b641f5cb..5ea0f86d8 100644
--- a/be.po
+++ b/be.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Дадаць"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Назад"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Дадаць"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Назад"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Пацвердзіць"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Адключыць"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "Пароль"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Пацвердзіць"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Адключыць"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/bg.po b/bg.po
index 9377d163d..310f3f637 100644
--- a/bg.po
+++ b/bg.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Директна (подразбиране)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Мост & прокси"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Извън линия"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Отключване"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Неуспешно заключване на постоянното дисково пространство."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Отключване..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Неуспешно отключване на криптираното дисково пространство със зададената парола."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Допълнителни настройки"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Отказ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Добави"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Назад"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Администраторска парола"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Фалшифициране на _MAC адрес"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Мрежова връзка"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Директна (подразбиране)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Мост & прокси"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Извън линия"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Вкл (подразбиране)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Вкл"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Изкл"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Изкл (подразбиране)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Изключване"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Стартиране на Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "по подразбиране: от ляво на дясно"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist върна грешка с код {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup върна грешка с код {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -196,7 +198,7 @@ msgid ""
"{stderr}"
msgstr "live-persist върна грешка с код {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -204,225 +206,37 @@ msgid ""
"{stderr}"
msgstr "umount върна грешка с код {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Администраторска парола"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Задаване на администраторска парола, за да могат да бъдат изпълянване задачи изискващи администраторски правомощия. В противен случай паролата ще бъде деактивирана за по-голяма сигурност."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Въведете администраторска парола"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Потвърждение"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Потвърдете администраторската парола"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Деактивиране"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows камуфлаж"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Тази опция променя Tails визуално, за да наподобява Microsoft Windows 10. Това е полезно за избягване привличане на вниманието на публични места."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 камуфлаж"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Подправяне на MAC адрес"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Подправянето на MAC адресa скрива серийнiя номер на вашата мрежова карта(WiFi или кабел) в локалната мрежа. Това засилва сигурността, защото подпомага прикриването на географското Ви местоположение."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Подправяне на всички MAC адреси (подразбиране)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Не подправяй MAC адресите"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Ще настроите Tor мост и локално прокси по-късно след установяване на връзка с мрежата."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Добре дошли в Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "За напътствия за настройките на Tails, натиснете <b>Разходка за добре дошли</b> по-горе"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Отключване"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Език & регион"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Неуспешно заключване на постоянното дисково пространство."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Настройки по подразбиране"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Отключване..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Запазване на настройките за език & регион"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Неуспешно отключване на криптираното дисково пространство със зададената парола."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Език"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Вид клавиатура"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Формати"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Времева зона"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Криптирано _пространство"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Покажи паролата"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Настройки на постоянното дисково пространство"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Въведете паролата за отключване на постоянното дисково пространство"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Заключване на постоянното дисково пространство"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Вашето дисково пространство е отключено. Рестартирайте Tails, за да го заключите отново."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Допълнителни настройки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Запазване на допълнителните настройки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Добавяне на допълнителни настройки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Настройки на мрежата"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ако интернет връзката е цензурирана, филтрирана, или използва прокси може да настроите Tor мост или локално прокси. За да работите изцяло офлайн може да деактивирате всички мрежови връзки."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Директна връзка с Tor мрежата (подразбиране)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Задаване на Tor мост или локално прокси"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Изключи всички мрежи"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Настройките по подразбиране са безопасни в повечето ситуации. За да зададете ръчни настройки натиснете \"+\" бутонът по-долу."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Администраторска парола"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Изкл (подразбиране)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Фалшифициране на _MAC адрес"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Вкл (подразбиране)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Мрежова връзка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Уиндоус камуфлаж"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Вкл"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Изкл"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -721,6 +535,11 @@ msgstr ""
msgid "Password"
msgstr "Парола"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Потвърждение"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Тази версия на Tails е известна с проблемите със сигурността:"
@@ -817,35 +636,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -854,14 +673,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -870,42 +689,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1103,6 +922,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Администраторска парола"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Задаване на администраторска парола, за да могат да бъдат изпълянване задачи изискващи администраторски правомощия. В противен случай паролата ще бъде деактивирана за по-голяма сигурност."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Въведете администраторска парола"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Потвърдете администраторската парола"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Деактивиране"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Подправяне на MAC адрес"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Подправянето на MAC адресa скрива серийнiя номер на вашата мрежова карта(WiFi или кабел) в локалната мрежа. Това засилва сигурността, защото подпомага прикриването на географското Ви местоположение."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Подправяне на всички MAC адреси (подразбиране)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Не подправяй MAC адресите"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Настройки на мрежата"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ако интернет връзката е цензурирана, филтрирана, или използва прокси може да настроите Tor мост или локално прокси. За да работите изцяло офлайн може да деактивирате всички мрежови връзки."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Директна връзка с Tor мрежата (подразбиране)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Задаване на Tor мост или локално прокси"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Изключи всички мрежи"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Ще настроите Tor мост и локално прокси по-късно след установяване на връзка с мрежата."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Добре дошли в Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Език & регион"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Настройки по подразбиране"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Криптирано _пространство"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Настройки на постоянното дисково пространство"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Въведете паролата за отключване на постоянното дисково пространство"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Заключване на постоянното дисково пространство"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Вашето дисково пространство е отключено. Рестартирайте Tails, за да го заключите отново."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Допълнителни настройки"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Добавяне на допълнителни настройки"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Настройките по подразбиране са безопасни в повечето ситуации. За да зададете ръчни настройки натиснете \"+\" бутонът по-долу."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/bn.po b/bn.po
index fab1111b9..aa4034842 100644
--- a/bn.po
+++ b/bn.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "সরাসরি (ডিফল্ট)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "ব্রিজ এবং প্রক্সি"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "অফলাইন"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "আনলক করুন"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "ক্রমাগত স্টোরেজ পুনঃস্থাপন করতে ব্যর্থ।"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "আনলক করা হচ্ছে ..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "এই পাসফ্রেজ সহ এনক্রিপ্ট করা সঞ্চয়স্থান আনলক করতে পারবেন না।"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "অতিরিক্ত বিন্যাস"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "বাতিল"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "যোগ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "পেছনে"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "সরাসরি (ডিফল্ট)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "ব্রিজ এবং প্রক্সি"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "অফলাইন"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "অন (ডিফল্ট)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "চালু"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "বন্ধ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "বন্ধ (ডিফল্ট)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "শাটডাউন"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Start Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "রিভিউ কোড {returncode} দিয়ে লাইভ-চলতে ব্যর্থ হয়েছে:\n{দ্বারা stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup রিটার্ন কোড {returncode} দিয়ে ব্যর্থ হয়েছে:\n{Stdout- এ}\n{দ্বারা stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr "রিভিউ কোড {returncode} দিয়ে লাইভ-চলতে ব্যর্থ হয়েছে:\n\n{Stdout- এ}\n{দ্বারা stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr "umount ফেরত কোড {returncode} দিয়ে ব্যর্থ হয়েছে:\n{Stdout- এ}\n{দ্বারা stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "প্রশাসন পাসওয়ার্ড"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "প্রশাসনিক কর্ম সঞ্চালনের প্রয়োজন হলে প্রশাসনিক পাসওয়ার্ড সেট করুন। অন্যথায়, উন্নত নিরাপত্তা ব্যবস্থার জন্য প্রশাসন পাসওয়ার্ড নিষ্ক্রিয় করা হয়েছে।"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "একটি প্রশাসনিক পাসওয়ার্ড লিখুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "নিশ্চিত করা"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "আপনার প্রশাসনের পাসওয়ার্ড নিশ্চিত করুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "টর অক্ষম"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "উইন্ডোজ ছদ্মবেশ"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "এই বিকল্পটি টাইলগুলি মাইক্রোসফট উইন্ডোজ 10 এর মত দেখাচ্ছে। এটি পাবলিক স্থানে শনাক্ত করার জন্য এড়ানো সম্ভব হতে পারে।"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "মাইক্রোসফট উইন্ডোজ 10 ছদ্মবেশ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "ম্যাক ঠিকানা স্পোফিং"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "ম্যাক অ্যাড্রেস স্পুফিং আপনার নেটওয়ার্কের ইন্টারফেসের সিরিয়াল নম্বর (ওয়াই-ফাই বা ওয়্যার্ড) স্থানীয় নেটওয়ার্ককে লুকিয়ে রাখে। স্পোকিং MAC অ্যাড্রেসগুলি সাধারণত নিরাপদ হয় কারণ এটি আপনাকে আপনার ভৌগোলিক অবস্থানকে লুকাতে সাহায্য করে। কিন্তু এটি সংযোগ সমস্যা তৈরি করতে পারে বা সন্দেহজনক দেখায়"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "সব MAC অ্যাড্রেস স্প্যাম (ডিফল্ট)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "এমএএসি অ্যাড্রেস স্পুফ করবেন না"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "আপনি নেটওয়ার্কে সংযোগের পরে পরে টর সেতু এবং স্থানীয় প্রক্সিকে কনফিগার করবেন।"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tails এ স্বাগতম!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Tails 'সেটিংস দ্বারা পরিচালিত পেতে, উপরে <b> একটি ট্যুর নিন </ b> ক্লিক করুন"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "আনলক করুন"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "ভাষা ও অঞ্চল"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "ক্রমাগত স্টোরেজ পুনঃস্থাপন করতে ব্যর্থ।"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ডিফল্ট সেটিংস"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "আনলক করা হচ্ছে ..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "ভাষা এবং অঞ্চল সেটিংস সংরক্ষণ করুন"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "এই পাসফ্রেজ সহ এনক্রিপ্ট করা সঞ্চয়স্থান আনলক করতে পারবেন না।"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Language"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Keyboard Layout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "এনক্রিপ্ট করা _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "পাসফ্রেজ দেখান"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "পার্সেন্টেন্ট স্টোরেজ কনফিগার করুন"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "স্থায়ী সঞ্চয়স্থান আনলক করতে আপনার পাসফ্রেজটি লিখুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Relock দৃঢ় সংগ্রহস্থল"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "আপনার স্থায়ী সঞ্চয়স্থান আনলক হয়। আবার এটি লক করার জন্য পুশ পুনরারন।"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "অতিরিক্ত সেটিংস সংরক্ষণ করুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "অতিরিক্ত সেটিংস সংরক্ষণ করুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "নেটওয়ার্ক কনফিগারেশন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "যদি আপনার ইন্টারনেট সংযোগ সেন্সর করা হয়, ফিল্টার করা হয় বা প্রক্সি করে তবে আপনি একটি টর সেতু বা স্থানীয় প্রক্সি কনফিগার করতে পারেন। সম্পূর্ণ অফলাইন কাজ করার জন্য, আপনি সমস্ত নেটওয়ার্কিং নিষ্ক্রিয় করতে পারেন।"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "টর নেটওয়ার্ক সরাসরি সংযুক্ত করুন (ডিফল্ট)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "একটি টর সেতু বা স্থানীয় প্রক্সি কনফিগার করুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "সমস্ত নেটওয়ার্কিং অক্ষম করুন"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "অধিকাংশ পরিস্থিতিতে ডিফল্ট সেটিংস নিরাপদ। একটি কাস্টম সেটিং যোগ করতে, নীচের \"+\" বোতাম টিপুন।"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "বন্ধ (ডিফল্ট)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "অন (ডিফল্ট)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "চালু"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "বন্ধ"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr "স্ক্রিন আনলক করতে একটি পাস
msgid "Password"
msgstr "পাসওয়ার্ড"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "নিশ্চিত করা"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tails এর এই সংস্করণ নিরাপত্তা বিষয় পরিচিত হয়েছে:"
@@ -808,35 +627,35 @@ msgstr "Onion বর্তনী খোলুন"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} ভলিউম"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} হয় {container_path}"
@@ -845,14 +664,14 @@ msgstr "{partition_name} হয় {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -861,42 +680,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "ভুল পাসফ্রেজ বা পরামিতি"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "ভলিউম আনলক ত্রুটি"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "ভলিউম আনলক করা যায়নি {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr "আপনার অতিরিক্ত সফ্টওয়্যার থেকে একটি প্যাকেজ অপসারণ করতে প্রত্যয়ন আবশ্যক ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "প্রশাসন পাসওয়ার্ড"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "প্রশাসনিক কর্ম সঞ্চালনের প্রয়োজন হলে প্রশাসনিক পাসওয়ার্ড সেট করুন। অন্যথায়, উন্নত নিরাপত্তা ব্যবস্থার জন্য প্রশাসন পাসওয়ার্ড নিষ্ক্রিয় করা হয়েছে।"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "একটি প্রশাসনিক পাসওয়ার্ড লিখুন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "আপনার প্রশাসনের পাসওয়ার্ড নিশ্চিত করুন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "টর অক্ষম"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "ম্যাক ঠিকানা স্পোফিং"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "ম্যাক অ্যাড্রেস স্পুফিং আপনার নেটওয়ার্কের ইন্টারফেসের সিরিয়াল নম্বর (ওয়াই-ফাই বা ওয়্যার্ড) স্থানীয় নেটওয়ার্ককে লুকিয়ে রাখে। স্পোকিং MAC অ্যাড্রেসগুলি সাধারণত নিরাপদ হয় কারণ এটি আপনাকে আপনার ভৌগোলিক অবস্থানকে লুকাতে সাহায্য করে। কিন্তু এটি সংযোগ সমস্যা তৈরি করতে পারে বা সন্দেহজনক দেখায়"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "সব MAC অ্যাড্রেস স্প্যাম (ডিফল্ট)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "এমএএসি অ্যাড্রেস স্পুফ করবেন না"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "নেটওয়ার্ক কনফিগারেশন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "যদি আপনার ইন্টারনেট সংযোগ সেন্সর করা হয়, ফিল্টার করা হয় বা প্রক্সি করে তবে আপনি একটি টর সেতু বা স্থানীয় প্রক্সি কনফিগার করতে পারেন। সম্পূর্ণ অফলাইন কাজ করার জন্য, আপনি সমস্ত নেটওয়ার্কিং নিষ্ক্রিয় করতে পারেন।"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "টর নেটওয়ার্ক সরাসরি সংযুক্ত করুন (ডিফল্ট)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "একটি টর সেতু বা স্থানীয় প্রক্সি কনফিগার করুন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "সমস্ত নেটওয়ার্কিং অক্ষম করুন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "আপনি নেটওয়ার্কে সংযোগের পরে পরে টর সেতু এবং স্থানীয় প্রক্সিকে কনফিগার করবেন।"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Tails এ স্বাগতম!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "ভাষা ও অঞ্চল"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ডিফল্ট সেটিংস"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "এনক্রিপ্ট করা _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "পার্সেন্টেন্ট স্টোরেজ কনফিগার করুন"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "স্থায়ী সঞ্চয়স্থান আনলক করতে আপনার পাসফ্রেজটি লিখুন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Relock দৃঢ় সংগ্রহস্থল"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "আপনার স্থায়ী সঞ্চয়স্থান আনলক হয়। আবার এটি লক করার জন্য পুশ পুনরারন।"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "অতিরিক্ত সেটিংস সংরক্ষণ করুন"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "অধিকাংশ পরিস্থিতিতে ডিফল্ট সেটিংস নিরাপদ। একটি কাস্টম সেটিং যোগ করতে, নীচের \"+\" বোতাম টিপুন।"
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "ফাইল ধারক"
diff --git a/br.po b/br.po
index 6aabdcba1..6a141729b 100644
--- a/br.po
+++ b/br.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Ezlinenn"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Ezlinenn"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Ouzhpennañ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Ger-tremen"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/bs.po b/bs.po
index 69823fdb4..8447d5f89 100644
--- a/bs.po
+++ b/bs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Otkaži"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Dodaj"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Nazad"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Otkaži"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Dodaj"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Nazad"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "potvrditi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "Lozinka"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "potvrditi"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ca.po b/ca.po
index 4c471f194..4c718b177 100644
--- a/ca.po
+++ b/ca.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Directe (defecte)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Pont i servidor intermedi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fora de línia"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquejar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Error al blocar l'emmagatzemament persistent."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloquejar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "No es pot desbloquejar la memòria encriptada amb la contrasenya."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Paràmetres adicionals"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancel·la"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Afegeix"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Enrere"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Contrasenya d'administrador"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Adreça MAC simulada"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Connexió de xarxa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directe (defecte)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Pont i servidor intermedi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fora de línia"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activació (defecte)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desactivar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Desactivació (defecte)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Tancar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Iniciar Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "per defecte:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist ha fallat amb el següent codi {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup amb el següent codi {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr "ive-persist ha fallat amb el següent codi {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
"{stderr}"
msgstr "unmount ha fallat amb el següent codi {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Contrasenya d'administador"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Configurar una contrasenya d'administrador, si ha de menester tasques d'administració. D'altra manera, la contrasenya d'administrador restarà deshabilitada per major seguretat."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduir contrasenya d'administrador"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirma"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmar la contrasenya d'administrador "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deshabilitar "
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflatge de Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Aquesta opció permet a Tails visualitzar-se com Microsoft Windows 10. Permeten no aixecar sospites en llocs públics."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflatge de Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Falsejament de direcció MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "El falsejament de la direcció MAC amaga el número de serie de xarxa (d'interfícies sense fils o amb fil) a la xarxa local. El falsejament de direccions MAC en general és segur al amagar la localització geogràfica. Però també crea problemes de connectivitat i sembla sospitós. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsejament de totes les direccions MAC (per defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsejar les direccions MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Configurarà el pont i el servidor intermedi de Tor, posterior a una connexió a la xarxa."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Benvingut a Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Per esser guiat als paràmetres de Tails, faci click a <b>Fer un visita guiada</b> a dalt."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquejar"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Llengua i regió"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Error al blocar l'emmagatzemament persistent."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configuració per defecte"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloquejar"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Desar paràmetres de llengua i regió"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "No es pot desbloquejar la memòria encriptada amb la contrasenya."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Llengua"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Disposició del teclat"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona horària"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Emmagatzematge persistent encriptat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostra contrasenya"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Paràmetres d'emmagatzematge persistent"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Entrar contrasenya per desbloquejar l'emmagatzematge persistent"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Re-bloquejar l'emmagatzemament persistent"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "El vostre emmagatzematge persistent està desbloquejat. Reinicieu Tails per a bloquejar-lo de nou."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Paràmetres addicionals"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Desar paràmetres addicionals"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Afegir paràmetres addicionals"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuració de xarxa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si la connexió a Internet és censurada, filtrada o amb servidor intermedi pot configurar un pont o servidor intermedi Tor. Per treballar fora de línia, pot deshabilitar totes les xarxes."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connectat directament a la xarxa Tor (per defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configureu un pont Tor o un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desactiva tota la xarxa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Els valors per defecte són segurs en la majoria de situacions. Per afegir una configuració personalitzada, pressionar el botó \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Contrasenya d'administrador"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Desactivació (defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Adreça MAC simulada"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Activació (defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Connexió de xarxa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflatge de finestres"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activat"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desactivar"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -726,6 +540,11 @@ msgstr "Establiu una contrasenya per a desblocar la pantalla."
msgid "Password"
msgstr "Contrasenya"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirma"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Aquesta versió de Tails té problemes de seguretat coneguts:"
@@ -822,35 +641,35 @@ msgstr "Obrint Circuits onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volum"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Lectura només)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} al {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} al {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} al {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} al {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Contrassenya o paràmetres incorrectes."
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Error al desbloquejar el volum"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "No s'ha pogut desbloquejar el volum {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Una o més aplicacions tenen el volum en ús."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "No s'ha pogut blocar el volum {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Ha fallat en blocar el volum"
@@ -1108,6 +927,130 @@ msgid ""
" ($(command_line))"
msgstr "Es necessita l'autenticació per eliminar un paquet del programari addicional ($ (command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Contrasenya d'administador"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Configurar una contrasenya d'administrador, si ha de menester tasques d'administració. D'altra manera, la contrasenya d'administrador restarà deshabilitada per major seguretat."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduir contrasenya d'administrador"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmar la contrasenya d'administrador "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Deshabilitar "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Falsejament de direcció MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "El falsejament de la direcció MAC amaga el número de serie de xarxa (d'interfícies sense fils o amb fil) a la xarxa local. El falsejament de direccions MAC en general és segur al amagar la localització geogràfica. Però també crea problemes de connectivitat i sembla sospitós. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsejament de totes les direccions MAC (per defecte)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsejar les direccions MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuració de xarxa"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si la connexió a Internet és censurada, filtrada o amb servidor intermedi pot configurar un pont o servidor intermedi Tor. Per treballar fora de línia, pot deshabilitar totes les xarxes."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connectat directament a la xarxa Tor (per defecte)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configureu un pont Tor o un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desactiva tota la xarxa"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Configurarà el pont i el servidor intermedi de Tor, posterior a una connexió a la xarxa."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Benvingut a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Llengua i regió"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configuració per defecte"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Emmagatzematge persistent encriptat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Paràmetres d'emmagatzematge persistent"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Entrar contrasenya per desbloquejar l'emmagatzematge persistent"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Re-bloquejar l'emmagatzemament persistent"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "El vostre emmagatzematge persistent està desbloquejat. Reinicieu Tails per a bloquejar-lo de nou."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Paràmetres addicionals"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Afegir paràmetres addicionals"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Els valors per defecte són segurs en la majoria de situacions. Per afegir una configuració personalitzada, pressionar el botó \"+\"."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Contenidors de fitxers"
diff --git a/cs.po b/cs.po
index 90abfad9c..c8d5aafbf 100644
--- a/cs.po
+++ b/cs.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Přímo (výchozí)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Odemknout"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nepodařilo se znovu zamknout trvalé úložiště."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Odemknutí..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nelze odemknout šifrované úložiště s tímto přístupovým heslem."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Další nastavení"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Zrušit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Přidat"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Zpět"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Heslo pro správu"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Falšování MAC adresy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Síťová připojení"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Přímo (výchozí)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Zapnuto (výchozí)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Zapnout"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Vypnout"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Vypnuto (výchozí)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Vypnout"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Spustit Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "výchozí:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist selhal s návratovým kódem {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup selhal s návratovým kódem {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr "live-persist selhal s návratovým kódem {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr "umount selhal s návratovým kódem {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Heslo pro správu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Pokud potřebujete provádět úkoly správy, nastavte administrátorské heslo. V opačném případě je heslo pro správu zakázáno pro lepší zabezpečení."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Zadejte heslo pro správu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Potvrdit"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potvrďte Vaše heslo pro správu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Zakázat"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Maskování Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Tato volba způsobuje, že Tails vypadají jako Microsoft Windows 10. To může být užitečné, aby nedocházelo k přilákání pozornosti a podezření na veřejných místech."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Maskování Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Falšování MAC adresy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Falšování MAC adres skryje sériové číslo vašeho síťového rozhraní (Wi-Fi nebo kabelového) v místní síti. Falšování MAC adres je obecně bezpečnější, protože vám pomůže skrýt vaše geografické umístění. Může to však také způsobit problémy s připojením nebo vypadat podezřele."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falšovat všechny MAC adresy (výchozí)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nefalšovat MAC adresy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Po připojení k síti nakonfigurujete přemostění Tor a lokální proxy."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Vítejte v Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Pokud se chcete nechat provést přes nastavení Tails, klikněte na <b>Nechat se provést</b> výše."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Odemknout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "undefined"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nepodařilo se znovu zamknout trvalé úložiště."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Výchozí nastavení"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Odemknutí..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Uložit nastavení pro jazyk a region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nelze odemknout šifrované úložiště s tímto přístupovým heslem."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Jazyk"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Rozložení kláves"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formáty"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Časové pásmo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Šifrované _Trvalé úložiště"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Zobrazit heslo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurace Trvalého úložiště"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Pro odemknutí trvalého uložiště zadejte heslo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Znovu zamčít trvalé úložiště"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Trvalé úložiště je odemčeno. Restart Tails ho znovu uzamkne."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Další nastavení"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Uložit Další nastavení"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Přidat další nastavení"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Konfigurace sítě"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Pokud je vaše internetové připojení cenzurováno, filtrováno nebo využívá proxy, můžete nakonfigurovat přemostění Tor nebo místní proxy. Chcete-li pracovat zcela offline, můžete zakázat všechna síťová připojení."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Připojit se přímo k síti Tor (výchozí)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurace přemostění TOR nebo místní proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Zakázat všechny sítě"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Výchozí nastavení je ve většině situací bezpečné. Chcete-li přidat vlastní nastavení, stiskněte níže tlačítko \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Heslo pro správu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Vypnuto (výchozí)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Falšování MAC adresy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Zapnuto (výchozí)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Síťová připojení"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Kamufláž"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Zapnout"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Vypnout"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr "Nastavte heslo pro odemčení obrazovky."
msgid "Password"
msgstr "Heslo"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Potvrdit"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tato verze Tails obsahuje následující bezpečnostní problémy:"
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (pouze ke čtení)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} v {container_path}"
@@ -855,14 +674,14 @@ msgstr "{partition_name} v {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} na {drive_name}"
@@ -871,42 +690,42 @@ msgstr "{partition_name} na {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Heslo pro správu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Pokud potřebujete provádět úkoly správy, nastavte administrátorské heslo. V opačném případě je heslo pro správu zakázáno pro lepší zabezpečení."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Zadejte heslo pro správu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potvrďte Vaše heslo pro správu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Zakázat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Falšování MAC adresy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Falšování MAC adres skryje sériové číslo vašeho síťového rozhraní (Wi-Fi nebo kabelového) v místní síti. Falšování MAC adres je obecně bezpečnější, protože vám pomůže skrýt vaše geografické umístění. Může to však také způsobit problémy s připojením nebo vypadat podezřele."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falšovat všechny MAC adresy (výchozí)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nefalšovat MAC adresy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurace sítě"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Pokud je vaše internetové připojení cenzurováno, filtrováno nebo využívá proxy, můžete nakonfigurovat přemostění Tor nebo místní proxy. Chcete-li pracovat zcela offline, můžete zakázat všechna síťová připojení."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Připojit se přímo k síti Tor (výchozí)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurace přemostění TOR nebo místní proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Zakázat všechny sítě"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Po připojení k síti nakonfigurujete přemostění Tor a lokální proxy."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Vítejte v Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "undefined"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Výchozí nastavení"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Šifrované _Trvalé úložiště"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurace Trvalého úložiště"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Pro odemknutí trvalého uložiště zadejte heslo"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Znovu zamčít trvalé úložiště"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Trvalé úložiště je odemčeno. Restart Tails ho znovu uzamkne."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Další nastavení"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Přidat další nastavení"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Výchozí nastavení je ve většině situací bezpečné. Chcete-li přidat vlastní nastavení, stiskněte níže tlačítko \"+\"."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Souborové kontejnery"
diff --git a/cy.po b/cy.po
index 51256908e..bd60b6b6c 100644
--- a/cy.po
+++ b/cy.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Llwythwch"
msgid "_Exit"
msgstr "_Gadael"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Canslo"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Yn ôl"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Canslo"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Ychwanegu"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Yn ôl"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr ""
msgid "Password"
msgstr "Cyfrinair"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Mae gan y fersiwn yma o Tails problemau diogelwich hysbys:"
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/da.po b/da.po
index d109bcad0..450d9460a 100644
--- a/da.po
+++ b/da.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Start"
msgid "_Exit"
msgstr "_Afslut"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direkte (standard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bro og proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Frakoblet"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Lås op"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Kunne ikke genlås vedvarende lagring."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Låser op…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan ikke låse krypteret lager op med denne adgangsfrase."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Yderligere indstillinger"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Annuller"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Tilføj"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Tilbage"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administrationsadgangskode"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC-adresse spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Netværksforbindelse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkte (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bro og proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Til (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Til"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Fra"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Fra (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Luk ned"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Start Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist fejlede med returkode {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup fejlede med returkode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr "live-persist fejlede med returkode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr "umount fejlede med returkode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administrationsadgangskode"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Opsæt en administrationsadgangskode hvis du har brug for at udføre administrative opgaver. Ellers deaktiveres administrationsadgangskoden for at opnå bedre sikkerhed."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Indtast en administrationsadgangskode"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bekræft"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bekræft din administrationsadgangskode"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deaktivér"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Denne valgmulighed får Tails til at se ud som Microsoft Windows 10. Det kan være nyttigt for at undgå at tiltrække opmærksomhed offentlige steder."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10-camouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC-adresse spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC-adresse spoofing skjuler serienummeret af din netværksgrænseflade (Wi-Fi eller kabel) til det lokale netværk. Spoofing MAC-adresser er generelt sikrere da det hjælper dig med at skjule din geografiske placering. Men det kan måske også give forbindelsesproblemer eller se mistænkeligt ud."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof alle MAC-adresser (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Spoof ikke MAC-adresser"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Du vil konfigurerer Tor-broen og lokal proxy senere efter der er oprettet forbindelse til et netværk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkommen til Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Klik på <b>Take a Tour</b> ovenfor, for at blive guidet gennem Tails' indstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Lås op"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Sprog og region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Kunne ikke genlås vedvarende lagring."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standardindstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Låser op…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Gem sprog- og regionsindstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan ikke låse krypteret lager op med denne adgangsfrase."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "S_prog"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Tastaturlayout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formater"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tidszone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Krypteret _vedvarende lager"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Vis adgangsfrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurer vedvarende lager"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Indtast din adgangsfrase for at låse det vedvarende lager op"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Lås vedvarende lager igen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Dit vedvarende lager er låst op. Genstart Tails for at låse det igen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Yderligere indstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Gem yderligere indstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Tilføj en yderligere indstilling"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Netværkskonfiguration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Hvis din internetforbindelse er censureret, filtreret eller proxiet kan du konfigurere en Tor-bro eller en lokal proxy. Du kan deaktivere al brug af netværk for at arbejde helt offline."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Opret direkte forbindelse til Tor-netværket (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurer en Tor-bro eller lokal proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deaktivér al brug af netværk"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Standardindstillingerne er sikre i de fleste situationer. Tryk på \"+\"-knappen nedenfor, for at tilføje en tilpasset indstilling."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrationsadgangskode"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Fra (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC-adresse spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Til (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Netværksforbindelse"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Til"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Fra"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr "Opsæt en adgangskode til at låse skærmen op."
msgid "Password"
msgstr "Adgangskode"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bekræft"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Denne version af Tails har følgende kendte sikkerhedsproblemer:"
@@ -818,35 +637,35 @@ msgstr "Åbn onionkredsløb"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} diskområde"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (skrivebeskyttet)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} i {container_path}"
@@ -855,14 +674,14 @@ msgstr "{partition_name} i {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} på {drive_name}"
@@ -871,42 +690,42 @@ msgstr "{partition_name} på {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Forkert adgangskode eller parametre"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Fejl ved oplåsning af diskområde"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Kunne ikke låse op for diskområdet {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "En eller flere programmer bruger diskområdet."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Kunne ikke låse diskområdet {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Låsning af diskområdet mislykkedes"
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr "Der kræves autentifikation for at fjerne en pakke fra dine yderligere software ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administrationsadgangskode"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Opsæt en administrationsadgangskode hvis du har brug for at udføre administrative opgaver. Ellers deaktiveres administrationsadgangskoden for at opnå bedre sikkerhed."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Indtast en administrationsadgangskode"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bekræft din administrationsadgangskode"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Deaktivér"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-adresse spoofing"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC-adresse spoofing skjuler serienummeret af din netværksgrænseflade (Wi-Fi eller kabel) til det lokale netværk. Spoofing MAC-adresser er generelt sikrere da det hjælper dig med at skjule din geografiske placering. Men det kan måske også give forbindelsesproblemer eller se mistænkeligt ud."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof alle MAC-adresser (standard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Spoof ikke MAC-adresser"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Netværkskonfiguration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Hvis din internetforbindelse er censureret, filtreret eller proxiet kan du konfigurere en Tor-bro eller en lokal proxy. Du kan deaktivere al brug af netværk for at arbejde helt offline."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Opret direkte forbindelse til Tor-netværket (standard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurer en Tor-bro eller lokal proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deaktivér al brug af netværk"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Du vil konfigurerer Tor-broen og lokal proxy senere efter der er oprettet forbindelse til et netværk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkommen til Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Sprog og region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standardindstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Krypteret _vedvarende lager"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurer vedvarende lager"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Indtast din adgangsfrase for at låse det vedvarende lager op"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Lås vedvarende lager igen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Dit vedvarende lager er låst op. Genstart Tails for at låse det igen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Yderligere indstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Tilføj en yderligere indstilling"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Standardindstillingerne er sikre i de fleste situationer. Tryk på \"+\"-knappen nedenfor, for at tilføje en tilpasset indstilling."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Filbeholdere"
diff --git a/de.po b/de.po
index 13cc312a1..d0ce08a32 100644
--- a/de.po
+++ b/de.po
@@ -36,8 +36,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Direkt (Vorgabe)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Brücke und Vermittlungsserver"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Entsperren"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Beständiger Speicherbereich konnte nicht wieder gesperrt werden."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Wird entsperrt…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Verschlüsselter Speicherbereich kann mit dieser Passphrase nicht entsperrt werden."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Zusätzliche Einstellungen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Abbrechen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Hinzufügen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Zurück"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administrationspasswort"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Manipulation der MAC-Adresse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Netzwerkverbindung"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkt (Vorgabe)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Brücke und Vermittlungsserver"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ein (Vorgabe)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ein"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Aus"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Aus (Vorgabe)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Herunterfahren"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "Tails _starten"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist ist mit Code {returncode} fehlgeschlagen:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -205,7 +207,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup ist mit Code {returncode} fehlgeschlagen:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -213,7 +215,7 @@ msgid ""
"{stderr}"
msgstr "live-persist fehlgeschlagen mit Rückgabecode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -221,225 +223,37 @@ msgid ""
"{stderr}"
msgstr "umount ist mit Code {returncode} fehlgeschlagen:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administrationspasswort"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Legen Sie ein Administrationspasswort fest, wenn Sie administrative Aufgaben ausüben müssen. Andernfalls ist das Administrationspasswort deaktiviert, um bessere Sicherheit gewährleisten zu können."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Geben Sie ein Administrationspasswort ein"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bestätigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bestätigen Sie Ihr Administrationspasswort"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deaktivieren"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-Tarnung"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Diese Option lässt Tails aussehen wie Microsoft Windows 10. Dies kann nützlich sein, um Verdacht auf öffentlichen Plätzen zu vermeiden."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft-Windows-10-Tarnung"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Manipulation der MAC-Adresse"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte (Wi-Fi oder Kabel) im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten. Aber es kann auch zu Verbindungsproblemen führen oder verdächtig wirken."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC-Adressen nicht manipulieren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Die Tor-Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem Verbinden mit dem Netzwerk konfigurieren."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Willkommen bei Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Um eine Führung durch die Einstellungen von Tails zu erhalten, oben <b>Take a Tour</b> klicken."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Entsperren"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Sprache & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Beständiger Speicherbereich konnte nicht wieder gesperrt werden."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Vorgabeeinstellungen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Wird entsperrt…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Sprache- und Regionseinstellungen speichern"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Verschlüsselter Speicherbereich kann mit dieser Passphrase nicht entsperrt werden."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "S_prache"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Tastaturbelegung"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formate"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zeitzone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Verschlüsselter _beständiger Speicherbereich"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Passphrase anzeigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Beständigen Speicherbereich konfigurieren"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Geben Sie Ihre Passphrase ein, um die beständigen Speicherbereich zu entsperren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Beständigen Speicherbereich wieder sperren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ihr beständiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn wieder zu sperren."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Zusätzliche Einstellungen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Zusätzliche Einstellungen speichern"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Zusätzliche Einstellung hinzufügen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Netzwerkkonfiguration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Wenn die Internetverbindung zensiert oder gefiltert wird, oder nur mit einem Vermittlungsserver (Proxy) funktioniert, kann eine Tor Brücke oder ein lokaler Vermittlungsserver konfiguriert werden. Um vollständig offline zu arbeiten, können die Netzwerkverbindungen zur Gänze deaktiviert werden."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Tor-Brücke oder lokalen Vermittlungsserver konfigurieren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Alle Netzwerkfunktionen deaktivieren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Die Standardeinstellungen sind in den meisten Situationen sicher. Um benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die Schaltfläche »+«."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrationspasswort"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Aus (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Manipulation der MAC-Adresse"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Ein (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Netzwerkverbindung"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-Tarnung"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ein"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Aus"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -738,6 +552,11 @@ msgstr "Stellen Sie ein Passwort zum Sperren des Bildschirms ein."
msgid "Password"
msgstr "Passwort"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bestätigen"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Diese Tails-Version weist Sicherheitslücken auf:"
@@ -834,35 +653,35 @@ msgstr "Offene Onion-Kanäle"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -871,14 +690,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} auf {drive_name}"
@@ -887,42 +706,42 @@ msgstr "{partition_name} auf {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Falsche Passphrase oder Parameter"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Fehler beim Entsperren des Volumens"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Volumen {volume_name}:{error_message} konnte nicht entsperrt werden"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Eine oder mehrere Anwendungen halten den Datenträger ausgelastet."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Der Datenträger {volume_name} konnte nicht gesperrt werden:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Sperren des Datenträgers fehlgeschlagen"
@@ -1120,6 +939,130 @@ msgid ""
" ($(command_line))"
msgstr "Authentifizierung wird benötigt, um ein Paket von Ihrer zusätzlichen Software-Liste zu entfernen ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administrationspasswort"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Legen Sie ein Administrationspasswort fest, wenn Sie administrative Aufgaben ausüben müssen. Andernfalls ist das Administrationspasswort deaktiviert, um bessere Sicherheit gewährleisten zu können."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Geben Sie ein Administrationspasswort ein"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bestätigen Sie Ihr Administrationspasswort"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Deaktivieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Manipulation der MAC-Adresse"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte (Wi-Fi oder Kabel) im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten. Aber es kann auch zu Verbindungsproblemen führen oder verdächtig wirken."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC-Adressen nicht manipulieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Netzwerkkonfiguration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Wenn die Internetverbindung zensiert oder gefiltert wird, oder nur mit einem Vermittlungsserver (Proxy) funktioniert, kann eine Tor Brücke oder ein lokaler Vermittlungsserver konfiguriert werden. Um vollständig offline zu arbeiten, können die Netzwerkverbindungen zur Gänze deaktiviert werden."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Tor-Brücke oder lokalen Vermittlungsserver konfigurieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Alle Netzwerkfunktionen deaktivieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Die Tor-Brücke und den lokalen Vermittlungsserver (Proxy) später nach dem Verbinden mit dem Netzwerk konfigurieren."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Willkommen bei Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Sprache & Region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Vorgabeeinstellungen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Verschlüsselter _beständiger Speicherbereich"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Beständigen Speicherbereich konfigurieren"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Geben Sie Ihre Passphrase ein, um die beständigen Speicherbereich zu entsperren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Beständigen Speicherbereich wieder sperren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Ihr beständiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn wieder zu sperren."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Zusätzliche Einstellungen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Zusätzliche Einstellung hinzufügen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Die Standardeinstellungen sind in den meisten Situationen sicher. Um benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die Schaltfläche »+«."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Datei-Container"
diff --git a/el.po b/el.po
index 70eeb9c7f..ac1fd483a 100644
--- a/el.po
+++ b/el.po
@@ -28,8 +28,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Απευθείας (προεπιλογή)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "_Γέφυρα & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Εκτός σύνδεσης"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Ξεκλείδωμα"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Αποτυχία επανακλειδώματος του μόνιμου χώρου αποθήκευσης."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Ξεκλειδώνεται..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Δεν μπορούμε να ξεκλειδώσουμε τον κρυπτογραφημένο αποθηκευτικό χώρο με αυτήν τη φράση κλειδί."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Πρόσθετες Ρυθμίσεις"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Άκυρο"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Προσθήκη"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Πίσω"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Κωδικός Πρόσβασης Διαχειριστή"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Αλλοίωση Διεύθυνσης MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Σύνδεση Δικτύου"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Απευθείας (προεπιλογή)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "_Γέφυρα & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Εκτός σύνδεσης"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ανοιχτό (προεπιλογή)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ανοιχτό"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Κλειστό"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Κλειστό (προεπιλογή)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Κλείσιμο"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Έναρξη Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "το live-persist απέτυχε με τον κωδικό επιστροφής {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr "η κρυπτογράφηση απέτυχε με τον κωδικό επιστροφής {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -205,7 +207,7 @@ msgid ""
"{stderr}"
msgstr "το live-persist απέτυχε με τον κωδικό επιστροφής {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -213,225 +215,37 @@ msgid ""
"{stderr}"
msgstr "το umount απέτυχε με τον κωδικό επιστροφής {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Κωδικός διαχειριστή"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Εισάγετε έναν κωδικό διαχείρισης σε περίπτωση που χρειαστείτε να πραγματοποιήσετε διαχειριστικές εργασίες. Ειδάλλως θα απενεργοποιηθεί για καλύτερη ασφάλεια."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Εισάγετε έναν κωδικό διαχειριστή "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Επιβεβαίωσε τον κωδικό διαχειριστή"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Απενεργοοίηση"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Καμουφλάζ Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Αυτή η επιλογή κάνει το Tails να μοιάζει με τα Microsoft Windows 10. Αυτό είναι χρήσιμο για να μην τραβάς την προσοχή και κινείς υποψίες σε δημόσιους χώρους."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Καμουφλάζ Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Αλλοίωση διεύθυνσης MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Η αλλοίωση διεύθυνσης MAC κρύβει τον σειριακό αριθμό των καρτών δικτύου σας (Ethernet ή Wi-Fi) για τα τοπικά δίκτυα. Αυτό είναι γενικά ασφαλέστερο γιατί σας βοηθάει να κρύβετε τη γεωγραφική θέση σας. Μπορεί όμως να δημιουργήσει προβλήματα συνδεσιμότητας ή να φαίνεται ύποπτο."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Αλλοίωση όλων των διευθύνσεων MAC (προεπιλογή)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Να μην αλλοιώνονται οι διευθύνσεις MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Θα ρυθμίσετε τη γέφυρα Tor και τον τοπικό proxy αργότερα, αφού πρώτα συνδεθείτε σε ένα δίκτυο."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Καλωσήρθατε στο Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Για να καθοδηγηθείτε μέσω των ρυθμίσεων του Tails, κάντε κλικ στην επιλογή <b>Οδηγός Περιήγησης</b> παραπάνω."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Ξεκλείδωμα"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Γλώσσα και περιοχή"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Αποτυχία επανακλειδώματος του μόνιμου χώρου αποθήκευσης."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Προεπιλεγμένες ρυθμίσεις"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Ξεκλειδώνεται..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Αποθήκευση ρυθμίσεων γλώσσας και περιοχής"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Δεν μπορούμε να ξεκλειδώσουμε τον κρυπτογραφημένο αποθηκευτικό χώρο με αυτήν τη φράση κλειδί."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Γλώσσα"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Διάταξη Πληκτρολογίου"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Τύποι"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Ζώνη Ώρας"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Κρυπτογραφημένος _Μόνιμος Χώρος Αποθήκευσης"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Εμφάνιση συνθηματικού"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Ρύθμιση Persistent Storage"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Εισάγετε το συνθηματικό για να ξεκλειδώσετε το μόνιμο χώρο αποθήκευσης"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Επανακλείδωμα του μόνιμου χώρου αποθήκευσης"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ο μόνιμος χώρος αποθήκευσής σας είναι ξεκλειδωμένος. Επανεκκινήστε το Tails για να το ξανακλειδώσετε."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Πρόσθετες Ρυθμίσεις"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Αποθήκευση πρόσθετων ρυθμίσεων"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Προσθήκη πρόσθετης ρύθμισης "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Ρύθμιση δικτύου"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Εάν η σύνδεσή σας στο Internet λογοκρίνεται, φιλτράρεται ή περνάει από Proxy, μπορείτε να διαμορφώσετε μια γέφυρα Tor ή έναν τοπικό Proxy. Για να εργαστείτε τελείως εκτός σύνδεσης, μπορείτε να απενεργοποιήσετε όλες τις συνδέσεις δικτύου."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Απευθείας σύνδεση με το δίκτυο Tor (προεπιλογή)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Διαμορφώστε μια γέφυρα Tor ή έναν τοπικό proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Απενεργοποιήστε όλα τα δίκτυα"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Οι προεπιλεγμένες ρυθμίσεις είναι ασφαλείς στις περισσότερες περιπτώσεις. Για να προσθέσετε μια προσαρμοσμένη ρύθμιση, πατήστε το κουμπί \"+\" παρακάτω."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Κωδικός Πρόσβασης Διαχειριστή"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Κλειστό (προεπιλογή)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Αλλοίωση Διεύθυνσης MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Ανοιχτό (προεπιλογή)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Σύνδεση Δικτύου"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Καμουφλάζ Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ανοιχτό"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Κλειστό"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -730,6 +544,11 @@ msgstr "Όρισε κωδικό για το κλείδωμα της οθόνης
msgid "Password"
msgstr "Κωδικός ασφαλείας"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Αυτή η έκδοση των Tails έχει γνωστά προβλήματα ασφαλείας:"
@@ -826,35 +645,35 @@ msgstr "Άνοιγμα κυκλωμάτων του Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Όγκος"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Μόνο-για-ανάγνωση)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} στο {container_path}"
@@ -863,14 +682,14 @@ msgstr "{partition_name} στο {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} - {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} στον {drive_name}"
@@ -879,42 +698,42 @@ msgstr "{partition_name} στον {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} - {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Λάθος συνθηματικό ή παράμετροι"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Σφάλμα ξεκλειδώματος όγκου δεδομένων"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Αδυναμία φεκλειδώματος όγκου δεδομένων {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1112,6 +931,130 @@ msgid ""
" ($(command_line))"
msgstr "Απαιτείται ταυτοποίηση για την απομάκρυνση ενός πακέτου από το πρόσθετο λογισμικό σας ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Κωδικός διαχειριστή"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Εισάγετε έναν κωδικό διαχείρισης σε περίπτωση που χρειαστείτε να πραγματοποιήσετε διαχειριστικές εργασίες. Ειδάλλως θα απενεργοποιηθεί για καλύτερη ασφάλεια."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Εισάγετε έναν κωδικό διαχειριστή "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Επιβεβαίωσε τον κωδικό διαχειριστή"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Απενεργοοίηση"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Αλλοίωση διεύθυνσης MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Η αλλοίωση διεύθυνσης MAC κρύβει τον σειριακό αριθμό των καρτών δικτύου σας (Ethernet ή Wi-Fi) για τα τοπικά δίκτυα. Αυτό είναι γενικά ασφαλέστερο γιατί σας βοηθάει να κρύβετε τη γεωγραφική θέση σας. Μπορεί όμως να δημιουργήσει προβλήματα συνδεσιμότητας ή να φαίνεται ύποπτο."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Αλλοίωση όλων των διευθύνσεων MAC (προεπιλογή)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Να μην αλλοιώνονται οι διευθύνσεις MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Ρύθμιση δικτύου"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Εάν η σύνδεσή σας στο Internet λογοκρίνεται, φιλτράρεται ή περνάει από Proxy, μπορείτε να διαμορφώσετε μια γέφυρα Tor ή έναν τοπικό Proxy. Για να εργαστείτε τελείως εκτός σύνδεσης, μπορείτε να απενεργοποιήσετε όλες τις συνδέσεις δικτύου."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Απευθείας σύνδεση με το δίκτυο Tor (προεπιλογή)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Διαμορφώστε μια γέφυρα Tor ή έναν τοπικό proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Απενεργοποιήστε όλα τα δίκτυα"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Θα ρυθμίσετε τη γέφυρα Tor και τον τοπικό proxy αργότερα, αφού πρώτα συνδεθείτε σε ένα δίκτυο."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Καλωσήρθατε στο Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Γλώσσα και περιοχή"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Προεπιλεγμένες ρυθμίσεις"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Κρυπτογραφημένος _Μόνιμος Χώρος Αποθήκευσης"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Ρύθμιση Persistent Storage"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Εισάγετε το συνθηματικό για να ξεκλειδώσετε το μόνιμο χώρο αποθήκευσης"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Επανακλείδωμα του μόνιμου χώρου αποθήκευσης"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Ο μόνιμος χώρος αποθήκευσής σας είναι ξεκλειδωμένος. Επανεκκινήστε το Tails για να το ξανακλειδώσετε."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Πρόσθετες Ρυθμίσεις"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Προσθήκη πρόσθετης ρύθμισης "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Οι προεπιλεγμένες ρυθμίσεις είναι ασφαλείς στις περισσότερες περιπτώσεις. Για να προσθέσετε μια προσαρμοσμένη ρύθμιση, πατήστε το κουμπί \"+\" παρακάτω."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Χώροι αρχείων"
diff --git a/en_GB.po b/en_GB.po
index d2fe6c339..71538e58f 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direct (default)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Unlock"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Failed to relock persistent storage."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Unlocking…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Cannot unlock encrypted storage with this passphrase."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Additional Settings"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancel"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Add"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Back"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direct (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "On (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Off (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Start Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
"{stderr}"
msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administration Password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirm"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirm your administration password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Disable"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "This option makes Tails look like Microsoft Windows 10. This can be useful to avoid attracting suspicion in public places."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 camouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC Address Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC address spoofing hides the serial number of your network interface (Wi-Fi or wired) to the local network. Spoofing MAC addresses is generally safer as it helps you hide your geographical location. But it might also create connectivity problems or look suspicious."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof all MAC addresses (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Don't spoof MAC addresses"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "You will configure the Tor bridge and local proxy later on after connecting to a network."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Welcome to Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Unlock"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Unlocking…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cannot unlock encrypted storage with this passphrase."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Language"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Keyboard Layout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Encrypted _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Show Passphrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configure Persistent Storage"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Enter your passphrase to unlock the persistent storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Relock Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Save Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Add an additional setting"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Network Configuration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "If your Internet connection is censored, filtered, or proxied you can configure a Tor bridge or a local proxy. To work completely offline, you can disable all networking."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connect directly to the Tor network (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configure a Tor bridge or local proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Disable all networking"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Off (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "On (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -713,6 +527,11 @@ msgstr "Set up a password to unlock the screen."
msgid "Password"
msgstr "Password"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirm"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "This version of Tails has known security issues:"
@@ -809,35 +628,35 @@ msgstr "Open Onion Circuits"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -846,14 +665,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -862,42 +681,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Wrong passphrase or parameters"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Error unlocking volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Couldn't unlock volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1095,6 +914,130 @@ msgid ""
" ($(command_line))"
msgstr "Authentication is required to remove a package from your additional software ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administration Password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirm your administration password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Disable"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Address Spoofing"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC address spoofing hides the serial number of your network interface (Wi-Fi or wired) to the local network. Spoofing MAC addresses is generally safer as it helps you hide your geographical location. But it might also create connectivity problems or look suspicious."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof all MAC addresses (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Don't spoof MAC addresses"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "If your Internet connection is censored, filtered, or proxied you can configure a Tor bridge or a local proxy. To work completely offline, you can disable all networking."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connect directly to the Tor network (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configure a Tor bridge or local proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Disable all networking"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "You will configure the Tor bridge and local proxy later on after connecting to a network."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Welcome to Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Language & Region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Default Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configure Persistent Storage"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Enter your passphrase to unlock the persistent storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Relock Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "File Containers"
diff --git a/eo.po b/eo.po
index 6490825f4..c58fddbc0 100644
--- a/eo.po
+++ b/eo.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Ŝalti"
msgid "_Exit"
msgstr "_Eliri"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Rezigni"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Aldoni"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Reen"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Rezigni"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Aldoni"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Reen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Malfunkciigi ĉiuj retoj"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Pasvorto"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tiu ĉi verzio de Tails havas famajn sekurecajn problemojn:"
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Malfunkciigi ĉiuj retoj"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/es.po b/es.po
index 1b7bc9521..d1368776b 100644
--- a/es.po
+++ b/es.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 17:21+0000\n"
-"Last-Translator: eulalio barbero espinosa <eulaliob(a)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(a)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 d721f5a77..e98bbd435 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Directo (por defecto)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Puente y Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fuera de línea"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Fallo en volver a bloquear almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "No se puede desbloquear el almacenamiento encriptado con esta frase de contraseña."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Configuraciones Adicionales"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancelar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Agregar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Atrás"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Clave de Administración"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Falsificación de dirección _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Conexión de _Red"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directo (por defecto)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Puente y Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fuera de línea"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Encendido (por defecto)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Prendido"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Apagado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Apagado (por defecto)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Apagar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Iniciar Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist falló con código de retorno {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -182,7 +184,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup falló con código de retorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -190,7 +192,7 @@ msgid ""
"{stderr}"
msgstr "live-persist falló con código de retorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -198,225 +200,37 @@ msgid ""
"{stderr}"
msgstr "umount falló con código de retorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Contraseña de Administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Configurá una contraseña de administración si necesitás realizar alguna tarea administrativa. Si no lo hacés, la contraseña de administración se deshabilita para mayor seguridad."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Ingresá una contraseña de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmá tu contraseña de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deshabilitar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflaje de Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opción hace a Tails parecer como Microsoft Windows 10. Esto puede ser útil para evitar atraer sospecha en lugares públicos."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflaje de Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Falsificación de dirección MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "La falsificación de la dirección MAC oculta el número de serie de tu interfaz de red (Wi-Fi o cableada) a la red local. Esta técnica es generalmente más segura ya que te ayuda a esconder tu ubicación geográfica. Pero también puede crear problemas de conectividad o parecer sospechoso."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsificar todas las direcciones MAC (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsificar las direcciones MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Vas a configurar el puente Tor y el proxy local luego, después de conectar a una red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "¡Bienvenido a Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Para ser guiado a través de los ajustes de Tails, cliqueá arriba en <b>Tomar un tour</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma y Región"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Fallo en volver a bloquear almacenamiento persistente"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configuración por defecto"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloqueando..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Guardar Configuración de Idioma y Región"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "No se puede desbloquear el almacenamiento encriptado con esta frase de contraseña."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Idioma"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "Distribución de _Teclado"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatos"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona Horaria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Almacenamiento encriptado _Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase de Contraseña"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar el Almacenamiento Persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Ingresá tu frase de contraseña para desbloquear el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Volver a bloquear almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Tu almacenamiento persistente está desbloqueado. Reiniciá Tails para bloquearlo de nuevo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Ajustes _Adicionales"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Guardar Configuraciones Adicionales"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Agregar una configuración adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuración de Red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si tu conexión a Internet está censurada, filtrada, o canalizada a travez de un tercero, podés configurar un puente Tor o un proxy local. Para trabajar completamente fuera de línea, podés deshabilitar todas las funciones de red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectar directamente a la red de Tor (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar un puente Tor o proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deshabilitar todas las funciones de red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Los ajustes por defecto son seguros en la mayoría de las situaciones. Para añadir un ajuste personalizado, presioná el botón \"+\" que está abajo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Clave de Administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Apagado (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Falsificación de dirección _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Encendido (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Conexión de _Red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camuflaje de _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Prendido"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Apagado"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -715,6 +529,11 @@ msgstr "Definí una contraseña para desbloquear la pantalla."
msgid "Password"
msgstr "Contraseña"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versión de Tails tiene problemas de seguridad conocidos:"
@@ -811,35 +630,35 @@ msgstr "Abrir circuitos Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volumen"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Sólo-Lectura)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} en {container_path}"
@@ -848,14 +667,14 @@ msgstr "{partition_name} en {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} en {drive_name}"
@@ -864,42 +683,42 @@ msgstr "{partition_name} en {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frase de contraseña o parámetros erróneos"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Error desbloqueando volumen"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "No se pudo desbloquear volumen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1097,6 +916,130 @@ msgid ""
" ($(command_line))"
msgstr "Se requiere autenticación para remover un paquete de tus programas adicionales ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Contraseña de Administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Configurá una contraseña de administración si necesitás realizar alguna tarea administrativa. Si no lo hacés, la contraseña de administración se deshabilita para mayor seguridad."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Ingresá una contraseña de administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmá tu contraseña de administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Falsificación de dirección MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "La falsificación de la dirección MAC oculta el número de serie de tu interfaz de red (Wi-Fi o cableada) a la red local. Esta técnica es generalmente más segura ya que te ayuda a esconder tu ubicación geográfica. Pero también puede crear problemas de conectividad o parecer sospechoso."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsificar todas las direcciones MAC (por defecto)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsificar las direcciones MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuración de Red"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si tu conexión a Internet está censurada, filtrada, o canalizada a travez de un tercero, podés configurar un puente Tor o un proxy local. Para trabajar completamente fuera de línea, podés deshabilitar todas las funciones de red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectar directamente a la red de Tor (por defecto)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar un puente Tor o proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deshabilitar todas las funciones de red"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Vas a configurar el puente Tor y el proxy local luego, después de conectar a una red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "¡Bienvenido a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma y Región"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configuración por defecto"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Almacenamiento encriptado _Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar el Almacenamiento Persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Ingresá tu frase de contraseña para desbloquear el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Volver a bloquear almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Tu almacenamiento persistente está desbloqueado. Reiniciá Tails para bloquearlo de nuevo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Ajustes _Adicionales"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Agregar una configuración adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Los ajustes por defecto son seguros en la mayoría de las situaciones. Para añadir un ajuste personalizado, presioná el botón \"+\" que está abajo."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Contenedores de archivo"
diff --git a/es_MX.po b/es_MX.po
index 1680e1e81..67914245f 100644
--- a/es_MX.po
+++ b/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Directo (predeterminado)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Puente & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fuera de Linea"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Abrir"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Falla en cerrar de nuevo el almacenamiento persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "No se puede descifrar el almacenamiento cifrardo con esta contraseña."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Configuracion adicional"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancelar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Agregar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Atrás"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Clave de Administrador"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Conexión de Red"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directo (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Puente & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fuera de Linea"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Encendido (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Apagado (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Apagar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Iniciar Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "predeterminado:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Clave de Administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Pon una clave de administración si necesitas realizar actividades administrativas. De otra manera, la clave de administración sera desactivada para tener mejor seguridad. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduce una clave de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirma tu clave de administración "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desactivar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflage Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opcion hace que Tails parezca Microsoft Windows 10. Esto puede ser util para evitar sospechas en espacios publicos."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "El camuflaje Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Dirección Mac Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "La dirección spoofing de Mac esconde el numero de serie de tu interfaz de red (Wi-Fi o alámbrica) a la red local. Direcciones Spoofing Mac son generalmente mas seguras por que te ayudan a esconder tu locación geográfica. Pero también pueden crear problemas de conexión o parecer sospechosas. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoofear todas las direcciones Mac (por defaulto) "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsificar direcciones MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Tu configuraras el puente Tor y el proxy local después de conectarse a una red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bienvenido a Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Para ser guiado por la configuración de Tails, clickea en <b>Tomar Tur</b> arriba"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Abrir"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Lenguaje y Región"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Falla en cerrar de nuevo el almacenamiento persistente."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configuración Estandar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloqueando..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Guardar Configuración de Lenguaje y Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "No se puede descifrar el almacenamiento cifrardo con esta contraseña."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Lenguaje"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Distribución de Teclado"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatos"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona Horaria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Almacenamiento _Cifrado Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Muestra la frase clave"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar Almacenamiento Persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Introduce tu fraseclave para abrir el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Cerrar Almacenamiento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Tu almacenamiento persistente esta abierto. Reinicia Tails para cerrarlo de nuevo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Configuración Adicional "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Guardar Configuración Adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Añadir una configuración adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuración de Red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si su conexión al internet esta censurada, filtrada u usada atravéz de un proxy, es possible que usted pueda configurar un puente Tor u un proxy local. Para trabajar completamente fuera de línea, puede desactivar por completo todas las redes."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectase directamente a la red Tor automáticamente (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar un puente Tor u un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desactivar toda actividad."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "La configuración predeterminada son seguras en la mayoría de las situaciones. Para añadir una configuración personal, haga clic en el button \"+\" abajo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Clave de Administrador"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Apagado (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Encendido (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Conexión de Red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflaje Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Contraseña"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versión de Tails tiene problemas de seguridad conocidos:"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Clave de Administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Pon una clave de administración si necesitas realizar actividades administrativas. De otra manera, la clave de administración sera desactivada para tener mejor seguridad. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduce una clave de administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirma tu clave de administración "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desactivar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Dirección Mac Spoofing"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "La dirección spoofing de Mac esconde el numero de serie de tu interfaz de red (Wi-Fi o alámbrica) a la red local. Direcciones Spoofing Mac son generalmente mas seguras por que te ayudan a esconder tu locación geográfica. Pero también pueden crear problemas de conexión o parecer sospechosas. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoofear todas las direcciones Mac (por defaulto) "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsificar direcciones MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuración de Red"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si su conexión al internet esta censurada, filtrada u usada atravéz de un proxy, es possible que usted pueda configurar un puente Tor u un proxy local. Para trabajar completamente fuera de línea, puede desactivar por completo todas las redes."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectase directamente a la red Tor automáticamente (predeterminado)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar un puente Tor u un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desactivar toda actividad."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Tu configuraras el puente Tor y el proxy local después de conectarse a una red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bienvenido a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Lenguaje y Región"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configuración Estandar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Almacenamiento _Cifrado Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar Almacenamiento Persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Introduce tu fraseclave para abrir el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Cerrar Almacenamiento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Tu almacenamiento persistente esta abierto. Reinicia Tails para cerrarlo de nuevo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Configuración Adicional "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Añadir una configuración adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "La configuración predeterminada son seguras en la mayoría de las situaciones. Para añadir una configuración personal, haga clic en el button \"+\" abajo."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/et.po b/et.po
index bd4d4a656..fe0978e5b 100644
--- a/et.po
+++ b/et.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Käivita"
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Katkesta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Lisa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Tagasi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Ava"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Katkesta"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Lisa"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Tagasi"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administreerimise parool"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Sisesta administreerimise parool"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Kinnita"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Kinnita oma administreerimise parool"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Keela"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Ava"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Keel ja piiskond"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Vaikeseaded"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Keel"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Ajavöönd"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Parool"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Kinnita"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr "Avatud Onion-ringteed"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administreerimise parool"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Sisesta administreerimise parool"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Kinnita oma administreerimise parool"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Keela"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Keel ja piiskond"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Vaikeseaded"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/eu.po b/eu.po
index f215c0e7a..80e967686 100644
--- a/eu.po
+++ b/eu.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Abiarazi"
msgid "_Exit"
msgstr "_Irten"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Zubia eta proxia"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Lineaz kanpo"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desblokeatu"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desblokeatzen..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Ezarpen gehigarriak"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Utzi"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Gehitu"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Atzera"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administrazio Pasahitza"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Sare Konexioa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Zubia eta proxia"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Lineaz kanpo"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Itzali"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Abiarazi Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -183,7 +185,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -191,7 +193,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -199,225 +201,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administrazio Pasahitza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Sartu kudeatzailearen pasahitza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Baieztatu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Berretsi zure administratzaile pasahitza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desgaitu"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows kamuflaia"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 kamuflaia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desblokeatu"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Ongi etorri Tails-era"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desblokeatzen..."
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Hizkuntza eta eskualdea"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Ezarpen lehenetsiak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Gorde Hizkuntza eta Herrialde Ezarpenak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Hizkuntza"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Teklatuaren Diseinua"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatuak"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Ordu-zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Erakutsi Sar-esaldia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ezarpen Gehiagarriak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Gorde ezarpen gehigarriak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Gehitu ezarpen gehigarria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Sare Ezarpenak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Ezgaitu konexio guztiak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrazio Pasahitza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Sare Konexioa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows kamuflaia"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -716,6 +530,11 @@ msgstr ""
msgid "Password"
msgstr "Sarhitza"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Baieztatu"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tails-eko bertsio honek egiaztatu diren segurtasun arazoak dauzka:"
@@ -812,35 +631,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -849,14 +668,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -865,42 +684,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1098,6 +917,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administrazio Pasahitza"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Sartu kudeatzailearen pasahitza"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Berretsi zure administratzaile pasahitza"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desgaitu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Sare Ezarpenak"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Ezgaitu konexio guztiak"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Ongi etorri Tails-era"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Hizkuntza eta eskualdea"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Ezarpen lehenetsiak"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Ezarpen Gehiagarriak"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Gehitu ezarpen gehigarria"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/fa.po b/fa.po
index a90fe70f1..91bcdcc88 100644
--- a/fa.po
+++ b/fa.po
@@ -33,8 +33,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "مستقیم (پیش فرض)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "پل و پروکسی"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "آفلاین"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "باز کردن قفل"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "قفل مجدد ذخیره دائمی موفق نبوده است."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "در حال باز کردن..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "با این عبارت عبور نمی توان انبار رمز گذاری را باز کرد"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "تنظیمات اضافی"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "لغو"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "افزودن"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "قبل"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_گذر واژه مدیریت"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_جعل آدرس MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_اتصال شبکه"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "مستقیم (پیش فرض)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "پل و پروکسی"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "آفلاین"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "روشن (پیش فرض)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "روشن"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "خاموش"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "خاموش (پیش فرض)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "خاموش کردن"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_آغاز Tailها"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "پیش فرض:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist موفق نبود با کد بازگشت {returncode}: \n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -202,7 +204,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup ناموفق بود با کد بازگشت {returncode}: {stdout} {stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -210,7 +212,7 @@ msgid ""
"{stderr}"
msgstr "live-persist موفق نبود با کد بازگشت {returncode}: {stdout} {stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -218,225 +220,37 @@ msgid ""
"{stderr}"
msgstr "دستور umount موفق نبود با کد بازگشت {returncode}: {stdout} {stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "گذرواژه مدیریت"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "اگر قصد کارهای مدیریتی را دارید، گذرواژه مدیریتی ایجاد کنید. در غیر این صورت گذرواژه مدیریتی برای امنیت بهتر غیرفعال خواهد بود."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "رمز عبور مدیر را وارد کنید"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "تایید "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "کلمه عبور مدیر خود را تایید کنید"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "غیرفعال کردن"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "پوشش ویندوز"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "این گزینه, مسیرها را مانند مایکروسافت ویندوز 10 می سازد. این می تواند جهت جلوگیری از جلب توجه در مکان های عمومی مفید باشد."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "مایکروسافت ویندوز 10 استتار"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "حقه بازی مک آدرس"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "جعل کردن آدرس مک، شماره سریال کارت شبکه شما ( وای فای یا سیمی ) را مخفی می کند. به این ترتیب می توانید موقعیت جغرافیایی خود را پنهان کنید. اما ممکن است اتصال با مشکل مواجه شود و یا مشکوک به نظر برسد."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "جعل همه آدرس های MAC (پیش فرض)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "جعل نکردن MAC آدرس ها"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "شما پس از اتصال به شبکه, پل تور و پروکسی محلی را بعدا پیکربندی خواهید کرد."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "به تیلز خوش آمدید!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "برای بدست آوردن کمک از طریق مسیرها, تنظیمات, روی <b> کلیک کنید و یک تور بالا </b> را بگیرید"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "باز کردن قفل"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "زبان و منطقه"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "قفل مجدد ذخیره دائمی موفق نبوده است."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "تنظیمات پیش فرض"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "در حال باز کردن..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "ذخیره تنظیمات زبان و منطقه"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "با این عبارت عبور نمی توان انبار رمز گذاری را باز کرد"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_زبان"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_طرح بندی صفحه کلید "
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_قالب ها"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_زمان منطقه"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "ذخیره دائمی رمزگذاری شده"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "نمایش کلمه عبور"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "پیکربندی ذخیره دائمی"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "رمز خود را برای باز کردن درایو ذخيره دائمی وارد کنید"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "قفل مجدد ذخیره دائمی"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "ذخیره دائمی باز شد. برای قفل کردن, Tail ها را ری استارت کنید"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_تنظیمات اضافی"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "ذخیره تنظیمات اضافی"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "اضافه کردن یک تنظیمات اضافی"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "پیکربندی شبکه"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "اگر ارتباط با اینترنت شما سانسور، فیلتر و یا پروکسی شده، شما میتوانید یک پل تور یا پروکسی محلی را تنظیم کنید. برای این که کاملا آفلاین کار کنید، میتوانید تمام شبکه را غیرفعال کنید."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "مستقیم به شبکه تور وصل شوید (پیشفرض)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "تنظیم پل تور یا پروکسی محلی"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "غیر فعال کردن همه شبکه ها"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "تنظیمات پیش فرض در بسیاری از موارد امنتر هستند. برای افزودن تنظیم سفارشی، دکمهی \"+\" در پایین را بفشارید."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_گذر واژه مدیریت"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "خاموش (پیش فرض)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_جعل آدرس MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "روشن (پیش فرض)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_اتصال شبکه"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_پوشش ویندوز"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "روشن"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "خاموش"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -735,6 +549,11 @@ msgstr "برای باز کردن صفحه یک گذرواژه تعیین کنی
msgid "Password"
msgstr "رمز عبور"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "تایید "
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "این نسخه از Tails این مشکلات امنیت شناخته شده را دارد:"
@@ -831,35 +650,35 @@ msgstr "یک مدار پیازی باز کن"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "حجم {volume_size}"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (فقط-خواندنی)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} در {container_path}"
@@ -868,14 +687,14 @@ msgstr "{partition_name} در {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} - {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} بر روی {drive_name}"
@@ -884,42 +703,42 @@ msgstr "{partition_name} بر روی {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} - {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "کلمه عبور یا پارامتر غلط"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "خطا در باز کردن حجم"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "قادر به باز کردن حجم {volume_name} نبودیم:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "عدم توانایی در قفل کردن حجم ذخیره سازی {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1117,6 +936,130 @@ msgid ""
" ($(command_line))"
msgstr "حذف بسته از نرم افزار اضافی شما نیازمند احراز هویت است ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "گذرواژه مدیریت"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "اگر قصد کارهای مدیریتی را دارید، گذرواژه مدیریتی ایجاد کنید. در غیر این صورت گذرواژه مدیریتی برای امنیت بهتر غیرفعال خواهد بود."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "رمز عبور مدیر را وارد کنید"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "کلمه عبور مدیر خود را تایید کنید"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "غیرفعال کردن"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "حقه بازی مک آدرس"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "جعل کردن آدرس مک، شماره سریال کارت شبکه شما ( وای فای یا سیمی ) را مخفی می کند. به این ترتیب می توانید موقعیت جغرافیایی خود را پنهان کنید. اما ممکن است اتصال با مشکل مواجه شود و یا مشکوک به نظر برسد."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "جعل همه آدرس های MAC (پیش فرض)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "جعل نکردن MAC آدرس ها"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "پیکربندی شبکه"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "اگر ارتباط با اینترنت شما سانسور، فیلتر و یا پروکسی شده، شما میتوانید یک پل تور یا پروکسی محلی را تنظیم کنید. برای این که کاملا آفلاین کار کنید، میتوانید تمام شبکه را غیرفعال کنید."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "مستقیم به شبکه تور وصل شوید (پیشفرض)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "تنظیم پل تور یا پروکسی محلی"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "غیر فعال کردن همه شبکه ها"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "شما پس از اتصال به شبکه, پل تور و پروکسی محلی را بعدا پیکربندی خواهید کرد."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "به تیلز خوش آمدید!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "زبان و منطقه"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "تنظیمات پیش فرض"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "ذخیره دائمی رمزگذاری شده"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "پیکربندی ذخیره دائمی"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "رمز خود را برای باز کردن درایو ذخيره دائمی وارد کنید"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "قفل مجدد ذخیره دائمی"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "ذخیره دائمی باز شد. برای قفل کردن, Tail ها را ری استارت کنید"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_تنظیمات اضافی"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "اضافه کردن یک تنظیمات اضافی"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "تنظیمات پیش فرض در بسیاری از موارد امنتر هستند. برای افزودن تنظیم سفارشی، دکمهی \"+\" در پایین را بفشارید."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "مخزن فایل"
diff --git a/fi.po b/fi.po
index 73e14c9b1..af97f3a51 100644
--- a/fi.po
+++ b/fi.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Silta & Välityspalvelin"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Poissa verkosta"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Poista lukitus"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Pysyvän säilytystilan uudelleenlukitus epäonnistui."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Avataan..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Lisäasetukset"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Peruuta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Lisää"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Takaisin"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Ylläpitosalasana"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Verkkoyhteys"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Silta & Välityspalvelin"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Poissa verkosta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Päällä (oletus)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Pois päältä"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Pois päältä (oletus)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Sammuta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Käynnistä Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -202,225 +204,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Ylläpitosalasana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Luo ylläpitosalasana, jos sinun tarvitsee suorittaa ylläpitotehtäviä. Muussa tapauksessa ylläpitäjän salasana on pois käytöstä paremman tietoturvan vuoksi."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Syötä ylläpitosalasana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Vahvista"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Vahvista ylläpitosalasanasi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Poista käytöstä"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-naamiointi"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Tämä saa Tailsin muistuttamaan Windows 10:tä, joka voi olla hyödyllistä julkisilla paikoilla huomion välttämiseksi."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 -naamiointi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC-osoitteen Väärentäminen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Poista lukitus"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Väärennä kaikki MAC-osoitteet (oletus)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Pysyvän säilytystilan uudelleenlukitus epäonnistui."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Älä väärennä MAC-osoitteita"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Avataan..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tervetuloa käyttämään Tailsia!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Paina ylläolevasta <b>Käy kiertueella</b>-linkistä saadaksesi opastusta Tails'in asetuksista"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Kieli & Alue"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Oletusasetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Tallenna kieli- ja alueasetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Kieli"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Näppäimistön pohja"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Aikavyöhyke"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Näytä salasana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Lukitse pysyvä säilytystila uudelleen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Pysyvä säilystilasi on auki. Käynnistä Tails uudelleen lukitaksesi se."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Lisäasetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Tallenna lisäasetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Lisää lisäasetus"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Poista kaikki verkkoyhteydet käytöstä"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Ylläpitosalasana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Pois päältä (oletus)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Päällä (oletus)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Verkkoyhteys"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Pois päältä"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -719,6 +533,11 @@ msgstr ""
msgid "Password"
msgstr "Salasana"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Vahvista"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tässä Tails-versiossa on tunnettuja turvallisuusriskejä:"
@@ -815,35 +634,35 @@ msgstr "Avaa sipulireititykset"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -852,14 +671,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -868,42 +687,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Virhe aseman avauksessa"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Aseman {volume_name} avaus epäonnistui: {error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1101,6 +920,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Ylläpitosalasana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Luo ylläpitosalasana, jos sinun tarvitsee suorittaa ylläpitotehtäviä. Muussa tapauksessa ylläpitäjän salasana on pois käytöstä paremman tietoturvan vuoksi."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Syötä ylläpitosalasana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Vahvista ylläpitosalasanasi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Poista käytöstä"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-osoitteen Väärentäminen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Väärennä kaikki MAC-osoitteet (oletus)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Älä väärennä MAC-osoitteita"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Poista kaikki verkkoyhteydet käytöstä"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Tervetuloa käyttämään Tailsia!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Kieli & Alue"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Oletusasetukset"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Lukitse pysyvä säilytystila uudelleen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Pysyvä säilystilasi on auki. Käynnistä Tails uudelleen lukitaksesi se."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Lisäasetukset"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Lisää lisäasetus"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Tiedostosäilöt"
diff --git a/fr.po b/fr.po
index 6d618f2a3..696ce466a 100644
--- a/fr.po
+++ b/fr.po
@@ -39,8 +39,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 029022e41..b10f532e6 100644
--- a/fy.po
+++ b/fy.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Start"
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Annulearje"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Annulearje"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Ofslute"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ga.po b/ga.po
index 3a8df80aa..f63e4f279 100644
--- a/ga.po
+++ b/ga.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Díreach (réamhshocrú)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Droichead agus Seachfhreastalaí"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "As líne"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Díghlasáil"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Níorbh fhéidir an stóras seasmhach a athghlasáil."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Á dhíghlasáil..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Ní féidir an stóras criptithe a dhíghlasáil leis an bhfrása faire seo."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Socruithe Breise"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cealaigh"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Nua"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Siar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "Foc_al Faire Riaracháin"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Bréagsheoltaí _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Cea_ngal Líonra"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Díreach (réamhshocrú)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Droichead agus Seachfhreastalaí"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "As líne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ar siúl (réamhshocrú)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ar siúl"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Múchta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Múchta (réamhshocrú)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Múch"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "To_saigh Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "Theip ar live-persist leis an gcód {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr "Theip ar cryptsetup leis an gcód {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr "Theip ar live-persist leis an gcód {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr "Theip ar umount leis an gcód {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Focal Faire Riaracháin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Is fiú focal faire riaracháin a shocrú más gá duit tascanna riaracháin a chur i gcrích. Is é sin, nó beidh an focal faire riaracháin díchumasaithe de bharr cúrsaí slándála."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Cuir isteach focal faire riaracháin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Deimhnigh"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Deimhnigh an focal faire riaracháin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Díchumasaigh"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Cuireann an rogha seo cuma Microsoft Windows 10 ar Tails. Tá sé seo úsáideach nuair nach bhfuil tú ag iarraidh amhras a mhúscailt in áit phoiblí."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 camouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Bréagsheoltaí MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Cuireann bréagsheoladh MAC sraithuimhir do chomhéadain líonra (Wi-Fi nó sreangaithe) i bhfolach. Go hiondúil tá sé níos sábháilte bréagsheoladh MAC a úsáid toisc go gcabhraíonn sé leat do shuíomh geografach a cheilt. Ach, uaireanta is cúis le fadhbanna líonra é, agus tá cuma amhrasach air freisin."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Úsáid bréagsheoltaí MAC i gcónaí (réamhshocrú)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ná húsáid bréagsheoltaí MAC riamh"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Cumróidh tú an droichead Tor agus an seachfhreastalaí áitiúil ar ball, tar éis duit ceangal a bhunú le líonra."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Fáilte go Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Chun turas treoraithe a dhéanamh trí shocruithe Tails, cliceáil <b>Déan Turas</b> thuas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Díghlasáil"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Teanga agus Réigiún"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Níorbh fhéidir an stóras seasmhach a athghlasáil."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Réamhshocruithe"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Á dhíghlasáil..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Sábháil Socruithe Teanga agus Réigiúin"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Ní féidir an stóras criptithe a dhíghlasáil leis an bhfrása faire seo."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Teanga"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Leagan Amach an Mhéarchláir"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formáidí"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Crios Ama"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Stóras _Seasmhach Criptithe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Taispeáin an Frása Faire"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Cumraíocht an Stórais Sheasmhaigh"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Cuir isteach an frása faire chun an stóras seasmhach a dhíghlasáil"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Athghlasáil an Stóras Seasmhach"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Tá an stóras seasmhach díghlasáilte. Atosaigh Tails lena chur faoi ghlas arís."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Socruithe Breise"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Sábháil Socruithe Breise"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Cuir socrú breise leis"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Cumraíocht Líonra"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Má dhéantar cinsireacht nó scagadh ar do cheangal Idirlín, nó má úsáideann sé seachfhreastalaí, is féidir leat droichead Tor nó seachfhreastalaí áitiúil a shocrú. Nó, is féidir leat an líonra a mhúchadh go huile is go hiomlán agus do chuid oibre a dhéanamh as líne."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Ceangal díreach le líonra Tor (réamhshocrú)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Cumraigh droichead Tor nó seachfhreastalaí áitiúil"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Díchumasaigh an líonra go hiomlán"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Tá na réamhshocruithe slán an chuid is mó den am. Brúigh an cnaipe \"+\" thíos le do shocrú féin a chur leis."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "Foc_al Faire Riaracháin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Múchta (réamhshocrú)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Bréagsheoltaí _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Ar siúl (réamhshocrú)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Cea_ngal Líonra"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ar siúl"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Múchta"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr "Socraigh focal faire chun an scáileán a dhíghlasáil."
msgid "Password"
msgstr "Focal faire"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Deimhnigh"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tá fadhbanna slándála sa leagan seo de Tails:"
@@ -807,35 +626,35 @@ msgstr "Ciorcaid Onion Oscailte"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "Imleabhar {volume_size}"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Inléite Amháin)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -844,14 +663,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} ar {drive_name}"
@@ -860,42 +679,42 @@ msgstr "{partition_name} ar {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frása faire mícheart nó paraiméadair mhíchearta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Earráid agus an t-imleabhar á dhíghlasáil"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Níorbh fhéidir imleabhar {volume_name}: a dhíghlasáil:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr "Caithfidh tú d'fhocal faire a thabhairt chun pacáiste de na bogearraí breise a bhaint ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Focal Faire Riaracháin"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Is fiú focal faire riaracháin a shocrú más gá duit tascanna riaracháin a chur i gcrích. Is é sin, nó beidh an focal faire riaracháin díchumasaithe de bharr cúrsaí slándála."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Cuir isteach focal faire riaracháin"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Deimhnigh an focal faire riaracháin"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Díchumasaigh"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Bréagsheoltaí MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Cuireann bréagsheoladh MAC sraithuimhir do chomhéadain líonra (Wi-Fi nó sreangaithe) i bhfolach. Go hiondúil tá sé níos sábháilte bréagsheoladh MAC a úsáid toisc go gcabhraíonn sé leat do shuíomh geografach a cheilt. Ach, uaireanta is cúis le fadhbanna líonra é, agus tá cuma amhrasach air freisin."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Úsáid bréagsheoltaí MAC i gcónaí (réamhshocrú)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ná húsáid bréagsheoltaí MAC riamh"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Cumraíocht Líonra"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Má dhéantar cinsireacht nó scagadh ar do cheangal Idirlín, nó má úsáideann sé seachfhreastalaí, is féidir leat droichead Tor nó seachfhreastalaí áitiúil a shocrú. Nó, is féidir leat an líonra a mhúchadh go huile is go hiomlán agus do chuid oibre a dhéanamh as líne."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Ceangal díreach le líonra Tor (réamhshocrú)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Cumraigh droichead Tor nó seachfhreastalaí áitiúil"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Díchumasaigh an líonra go hiomlán"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Cumróidh tú an droichead Tor agus an seachfhreastalaí áitiúil ar ball, tar éis duit ceangal a bhunú le líonra."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Fáilte go Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Teanga agus Réigiún"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Réamhshocruithe"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Stóras _Seasmhach Criptithe"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Cumraíocht an Stórais Sheasmhaigh"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Cuir isteach an frása faire chun an stóras seasmhach a dhíghlasáil"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Athghlasáil an Stóras Seasmhach"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Tá an stóras seasmhach díghlasáilte. Atosaigh Tails lena chur faoi ghlas arís."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Socruithe Breise"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Cuir socrú breise leis"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Tá na réamhshocruithe slán an chuid is mó den am. Brúigh an cnaipe \"+\" thíos le do shocrú féin a chur leis."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Coimeádáin"
diff --git a/gd.po b/gd.po
index 3a7e0f742..86c4cfae1 100644
--- a/gd.po
+++ b/gd.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 591bc9ff5..a0bc30288 100644
--- a/gl.po
+++ b/gl.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Iniciar"
msgid "_Exit"
msgstr "_Saír"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Engadir"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Anterior"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
msgid "Offline"
msgstr "Desconectado"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Engadir"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Anterior"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desactivar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflaxe de Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Axustes por defecto"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloqueando..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deshabilitar toda conexión á rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr ""
msgid "Password"
msgstr "Contrasinal"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versión de Tails ten os seguintes problemas de seguridade coñecidos:"
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desactivar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deshabilitar toda conexión á rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Axustes por defecto"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/gu.po b/gu.po
index 29ca82423..bd4e7effb 100644
--- a/gu.po
+++ b/gu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "ઑફલાઇન"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "લોક ખોલો"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "અનલૉક થઇ રહ્યું..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "વધારાની સેટિંગ્સ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "રદ્ કરો"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "ઉમેરો"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "પહેલાનું"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "ઑફલાઇન"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "બંધ કરો"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "મૂળભૂત:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "વહીવટ પાસવર્ડ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "વહીવટ પાસવર્ડ દાખલ કરો"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "પુષ્ટિ કરો "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "તમારા વહીવટ પાસવર્ડની પુષ્ટિ કરો "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "નિષ્ક્રિય કરો"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 camouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC Address સ્પોફિંગ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "લોક ખોલો"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tails પર આપનું સ્વાગત છે!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "અનલૉક થઇ રહ્યું..."
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "ભાષા અને પ્રદેશ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "મૂળભૂત સેટિંગ્સ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "ભાષા અને પ્રદેશ સેટિંગ્સ સાચવો"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Language"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Keyboard Layout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "એનક્રિપ્ટ થયેલ સતત સંગ્રહ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "સતત સ્ટોરેજ રૂપરેખાંકિત કરો"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "વધારાના સેટિંગ્સ સાચવો"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "વધારાના સેટિંગ ઉમેરો"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "નેટવર્ક અનામિત્વ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "પાસવર્ડ"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "પુષ્ટિ કરો "
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "વહીવટ પાસવર્ડ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "વહીવટ પાસવર્ડ દાખલ કરો"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "તમારા વહીવટ પાસવર્ડની પુષ્ટિ કરો "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "નિષ્ક્રિય કરો"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Address સ્પોફિંગ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "નેટવર્ક અનામિત્વ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Tails પર આપનું સ્વાગત છે!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "ભાષા અને પ્રદેશ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "મૂળભૂત સેટિંગ્સ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "એનક્રિપ્ટ થયેલ સતત સંગ્રહ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "સતત સ્ટોરેજ રૂપરેખાંકિત કરો"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "વધારાના સેટિંગ ઉમેરો"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/he.po b/he.po
index e0e9072a8..2a61cc5c1 100644
--- a/he.po
+++ b/he.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "ישיר (ברירת מחדל)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "גשר וייפוי־כוח"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "לא מקוון"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "בטל נעילה"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "נכשל בנעילה מחדש של אחסון מתמיד."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "מבטל נעילה..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "אינו יכול לבטל נעילת אחסון מוצפן עם ביטוי סיסמה זה."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "הגדרות נוספות"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "בטל"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "הוסף"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "הקודם"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_סיסמת מינהל"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_זיוף כתובת MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "חיבור _רשת"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "ישיר (ברירת מחדל)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "גשר וייפוי־כוח"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "לא מקוון"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "פועל (ברירת מחדל)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "הפעל"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "כבה"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "כבוי (ברירת מחדל)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "כבה"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_התחל את Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist נכשל עם חזרה {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -183,7 +185,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup נכשל עם קוד חזרה {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -191,7 +193,7 @@ msgid ""
"{stderr}"
msgstr "live-persist נכשל עם קוד חזרה {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -199,225 +201,37 @@ msgid ""
"{stderr}"
msgstr "umount נכשל עם קוד חזרה {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "סיסמת מינהל"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "הסדר סיסמת מינהל אם אתה צריך לבצע מטלות מינהליות. אחרת, סיסמת המינהל מושבתת למען אבטחה טובה יותר."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "הכנס סיסמת מינהל"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "אשר"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "אשר את סיסמת המינהל שלך"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "השבת"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "הסוואה של Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "אפשרות זו גורמת ל-Tails להיראות כמו Microsoft Windows 10. זה יכול להיות שימושי כדי להימנע ממשיכת חשד במקומות ציבוריים."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "הסוואת Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "זיוף כתובת MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "זיוף כתובת MAC מסתיר את המספר הסידורי של ממשק הרשת שלך (Wi-Fi או מחויט) אל הרשת המקומית. זיוף כתובות MAC בטוח יותר באופן כללי בעוד שזה עוזר לך להסתיר את מיקומך הגיאוגרפי, אבל זה עלול ליצור בעיות קישוריות או להיראות חשוד."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "זייף את כל כתובות ה-MAC (ברירת מחדל)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "אל תזייף כתובות MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "תתצר את גשר ה-Tor ואת ייפוי־הכוח מאוחר יותר לאחר התחברות אל רשת."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "ברוך הבא אל Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "כדי להיות מודרך בהגדרות Tails, לחץ על <b>קח סיור</b> למעלה"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "בטל נעילה"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "שפה ואיזור"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "נכשל בנעילה מחדש של אחסון מתמיד."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "הגדרות ברירת מחדל"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "מבטל נעילה..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "שמור הגדרות של שפה ואיזור"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "אינו יכול לבטל נעילת אחסון מוצפן עם ביטוי סיסמה זה."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_שפה"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_מערך מקלדת"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_תסדירים"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_איזור זמן"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "אחסון _מתמיד מוצפן"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "הראה ביטוי סיסמה"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "תצר אחסון מתמיד"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "הכנס את ביטוי הסיסמה שלך כדי לבטל נעילת אחסון מתמיד"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "נעל מחדש אחסון מתמיד"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "האחסון המתמיד שלך אינו נעול. הפעל מחדש את Tails כדי לנעול אותו שוב."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "הגדרות _נוספות"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "שמור הגדרות נוספות"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "הוסף הגדרה נוספת"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "תצורת רשת"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "אם חיבור האינטרנט שלך מצונזר, מסונן או עובר דרך ייפוי־כוח, אתה יכול לתצר גשר Tor או ייפוי־כוח מקומי. כדי לעבוד באופן מקוון לחלוטין, אתה יכול להשבית את כל הרישות."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "התחבר ישירות אל רשת Tor (ברירת מחדל)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "תצר גשר Tor או ייפוי־כוח מקומי"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "השבת את כל הרישות"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "הגדרות ברירת המחדל בטוחות ברוב המצבים. כדי להוסיף הגדרה מותאמת, לחץ על הכפתור \"+\" למטה."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_סיסמת מינהל"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "כבוי (ברירת מחדל)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_זיוף כתובת MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "פועל (ברירת מחדל)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "חיבור _רשת"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_הסוואת Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "הפעל"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "כבה"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -716,6 +530,11 @@ msgstr "קבע סיסמה לביטול נעילת המסך."
msgid "Password"
msgstr "סיסמה"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "אשר"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "לגרסה זו של Tails יש סוגיות אבטחה ידועות:"
@@ -812,35 +631,35 @@ msgstr "פתח מעגל בצל"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} כרך"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (קריאה בלבד)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} ב {container_path}"
@@ -849,14 +668,14 @@ msgstr "{partition_name} ב {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} על {drive_name}"
@@ -865,42 +684,42 @@ msgstr "{partition_name} על {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "ביטוי סיסמה שגוי או פרמטרים שגויים"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "שגיאה בביטול נעילת כרך"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "לא היה ניתן לבטל נעילת כרך {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "יישום אחד או יותר מעסיקים את הכרך."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "לא היה ניתן לנעול כרך {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "נעילת הכרך נכשלה"
@@ -1098,6 +917,130 @@ msgid ""
" ($(command_line))"
msgstr "אימות נדרש כדי להסיר חבילה מתוך תוכנה נוספת שלך ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "סיסמת מינהל"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "הסדר סיסמת מינהל אם אתה צריך לבצע מטלות מינהליות. אחרת, סיסמת המינהל מושבתת למען אבטחה טובה יותר."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "הכנס סיסמת מינהל"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "אשר את סיסמת המינהל שלך"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "השבת"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "זיוף כתובת MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "זיוף כתובת MAC מסתיר את המספר הסידורי של ממשק הרשת שלך (Wi-Fi או מחויט) אל הרשת המקומית. זיוף כתובות MAC בטוח יותר באופן כללי בעוד שזה עוזר לך להסתיר את מיקומך הגיאוגרפי, אבל זה עלול ליצור בעיות קישוריות או להיראות חשוד."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "זייף את כל כתובות ה-MAC (ברירת מחדל)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "אל תזייף כתובות MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "תצורת רשת"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "אם חיבור האינטרנט שלך מצונזר, מסונן או עובר דרך ייפוי־כוח, אתה יכול לתצר גשר Tor או ייפוי־כוח מקומי. כדי לעבוד באופן מקוון לחלוטין, אתה יכול להשבית את כל הרישות."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "התחבר ישירות אל רשת Tor (ברירת מחדל)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "תצר גשר Tor או ייפוי־כוח מקומי"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "השבת את כל הרישות"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "תתצר את גשר ה-Tor ואת ייפוי־הכוח מאוחר יותר לאחר התחברות אל רשת."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "ברוך הבא אל Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "שפה ואיזור"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "הגדרות ברירת מחדל"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "אחסון _מתמיד מוצפן"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "תצר אחסון מתמיד"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "הכנס את ביטוי הסיסמה שלך כדי לבטל נעילת אחסון מתמיד"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "נעל מחדש אחסון מתמיד"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "האחסון המתמיד שלך אינו נעול. הפעל מחדש את Tails כדי לנעול אותו שוב."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "הגדרות _נוספות"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "הוסף הגדרה נוספת"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "הגדרות ברירת המחדל בטוחות ברוב המצבים. כדי להוסיף הגדרה מותאמת, לחץ על הכפתור \"+\" למטה."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "מֵכַלי קבצים"
diff --git a/hi.po b/hi.po
index 63a33b8ff..2fe518385 100644
--- a/hi.po
+++ b/hi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "ऑफलाइन"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "अनलॉक"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "अनलॉकिंग"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "इस पासफ़्रेज़ के साथ एन्क्रिप्टेड स्टोरेज को अनलॉक नहीं किया जा सकता है।"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "अतिरिक्त सेटिंग्स"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "रद्द करें"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "डालो"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "पिछला"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "ऑफलाइन"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "प्रशासन का पासवर्ड"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "यदि आपको प्रशासनिक कार्य करने की आवश्यकता है तो एक प्रशासन पासवर्ड सेट करें। अन्यथा, बेहतर सुरक्षा के लिए प्रशासन पासवर्ड अक्षम है।"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "प्रशासन पासवर्ड दर्ज करें"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "पुष्टि करें"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "अपने प्रशासन के पासवर्ड की पुष्टि करें"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "अक्षम"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "विंडोज छलावरण"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "अनलॉक"
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "भाषा और क्षेत्र"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "डिफ़ॉल्ट सेटिंग्स"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "अनलॉकिंग"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "भाषा और क्षेत्र सेटिंग सहेजें"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "इस पासफ़्रेज़ के साथ एन्क्रिप्टेड स्टोरेज को अनलॉक नहीं किया जा सकता है।"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_भाषा"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_कुंजीपटल ख़ाका"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "पासवर्ड"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "पुष्टि करें"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "प्रशासन का पासवर्ड"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "यदि आपको प्रशासनिक कार्य करने की आवश्यकता है तो एक प्रशासन पासवर्ड सेट करें। अन्यथा, बेहतर सुरक्षा के लिए प्रशासन पासवर्ड अक्षम है।"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "प्रशासन पासवर्ड दर्ज करें"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "अपने प्रशासन के पासवर्ड की पुष्टि करें"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "अक्षम"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "भाषा और क्षेत्र"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "डिफ़ॉल्ट सेटिंग्स"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/hr.po b/hr.po
index 478013a49..09f73d4e3 100644
--- a/hr.po
+++ b/hr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Pokreni"
msgid "_Exit"
msgstr "_Izlaz"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direktno (zadano)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Most i proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Otključaj"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nije uspjelo zaključavanje trajne pohrane."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Otključavam..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Ne mogu otključati enkriptiranu pohranu s ovom lozinkom."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Dodatne postavke"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancel"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Dodaj"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Povratak"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administratorska lozinka"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Maskiranje MAC adrese"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Mrežna veza"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direktno (zadano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Most i proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Uključeno (zadano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Uključeno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Isključeno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Isključeno (zadano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Gašenje"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Pokreni Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "zadano:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist nije uspio s povratnim kodom {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup nije uspio s povratnim kodom {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr "trajna pohrana nije vratila kod {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr "Umount nije uspio s povratnim kodom {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administratorska lozinka"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Postavite administratorsku lozinku ako trebate izvoditi administratorske zadatke. U suprotnom, administratorska lozinka će biti onemogućena zbog bolje sigurnosti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Unesite administratorsku lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potvrdite svoju administratorsku lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Onemogući"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows maskiranje"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Ova opcija maskira Tails u Windows 10. To može biti korisno za izbjegavanje pozornosti na javnim mjestima."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 kamuflaža"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Maskiranje MAC adrese"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Maskiranje MAC adrese krije serijski broj Vašeg mrežnog sučelja (Wi-Fi ili žičanog adaptera) na lokalnu mrežu. Maskiranje MAC adrese je generalno sigurnije jer Vam pomaže da sakrijete svoju geografsku lokaciju, ali može stvoriti probleme sa vezom ili izazvati sumnju."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Maskiraj sve MAC adrese (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ne maskiraj MAC adrese"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Konfigurirat će te Tor most i lokalni proxy kasnije, nakon spajanja na mrežu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Dobrodošli u Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Da bi Vas proveli kroz Tails postavke, kliknite na <b>Obilazak</b> iznad"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Otključaj"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Jezik i regija"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nije uspjelo zaključavanje trajne pohrane."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Zadane postavke"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Otključavam..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Spremite postavke jezika i regije"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Ne mogu otključati enkriptiranu pohranu s ovom lozinkom."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Jezik"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Raspored tipkovnice"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formati"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Vremenska zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Enkriptirana _Trajna pohrana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Pokaži lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Postavi trajnu pohranu"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Unesite lozinku za otključavanje trajne pohrane"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Zaključaj trajnu pohranu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Vaša trajna pohrana je otključana. Ponovno pokrenite Tails kako bi ju opet zaključali."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Dodatne postavke"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Spremi dodatne postavke"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Dodaj dodatne postavke"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Mrežna konfiguracija"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ako je Vaša Internet veza cenzurirana, filtrirana ili iza proxya, možete konfigurirati Tor most ili lokalni proxy. Kako bi radili kompletno offline, možete onemogućiti sve mrežne radnje."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Spoji se izravno na Tor mrežu (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurirajte Tor most ili lokalni proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Onemogući sav mrežni rad"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Zadane postavke su sigurne u većini situacija. Kako bi dodali prilagođene postavke, stisnite \"+\" gumb."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administratorska lozinka"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Isključeno (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Maskiranje MAC adrese"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Uključeno (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Mrežna veza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows kamuflaža"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Uključeno"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Isključeno"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Lozinka"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Potvrdi"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Ova verzija Tailsa ima poznate sigurnosne probleme:"
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administratorska lozinka"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Postavite administratorsku lozinku ako trebate izvoditi administratorske zadatke. U suprotnom, administratorska lozinka će biti onemogućena zbog bolje sigurnosti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Unesite administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potvrdite svoju administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Onemogući"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Maskiranje MAC adrese"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Maskiranje MAC adrese krije serijski broj Vašeg mrežnog sučelja (Wi-Fi ili žičanog adaptera) na lokalnu mrežu. Maskiranje MAC adrese je generalno sigurnije jer Vam pomaže da sakrijete svoju geografsku lokaciju, ali može stvoriti probleme sa vezom ili izazvati sumnju."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Maskiraj sve MAC adrese (zadano)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ne maskiraj MAC adrese"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Mrežna konfiguracija"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ako je Vaša Internet veza cenzurirana, filtrirana ili iza proxya, možete konfigurirati Tor most ili lokalni proxy. Kako bi radili kompletno offline, možete onemogućiti sve mrežne radnje."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Spoji se izravno na Tor mrežu (zadano)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurirajte Tor most ili lokalni proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Onemogući sav mrežni rad"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Konfigurirat će te Tor most i lokalni proxy kasnije, nakon spajanja na mrežu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Dobrodošli u Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Jezik i regija"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Zadane postavke"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Enkriptirana _Trajna pohrana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Postavi trajnu pohranu"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Unesite lozinku za otključavanje trajne pohrane"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Zaključaj trajnu pohranu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Vaša trajna pohrana je otključana. Ponovno pokrenite Tails kako bi ju opet zaključali."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Dodatne postavke"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Dodaj dodatne postavke"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Zadane postavke su sigurne u većini situacija. Kako bi dodali prilagođene postavke, stisnite \"+\" gumb."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/hu.po b/hu.po
index 02f597551..50db9236a 100644
--- a/hu.po
+++ b/hu.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Közvetlen (alapértelmezett)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Híd és proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Feloldás"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Sikertelen a tartóstár vissza zárása."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Feloldás..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "A titkosított tároló nem dekódolható ezzel a jelszóval."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "További beállítások"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Mégse"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Hozzáad"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Vissza"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Adminisztrációs jelszó"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC cím hamisítás"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Hálózati kapcsolat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Közvetlen (alapértelmezett)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Híd és proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Be (alapértelmezett)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Be"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Ki"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Ki (alapértelmezett)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Leállítás"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Tails indítása"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -201,225 +203,37 @@ msgid ""
"{stderr}"
msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Adminisztrátori jelszó"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Állítson be egy adminisztrátori jelszót, ha szükséges adminisztrációs feladatokat végezni. Egyébként az adminisztrátori jelszó tiltott a magasabb biztonság érdekében."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Adjon meg egy adminisztrátori jelszót"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Megerősít"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Erősítse meg adminisztrációs jelszavát"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Kikapcsol"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows álcázás"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Ez az opció a Tails-t olyanná alakítja, hogy hasonltíson a Microsoft Windows 10-hez. Ez hasznos lehet annak elkerülésére, hogy publikus helyen felfigyeljenek Önre."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 álca"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC cím hamisítás"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "A MAC cím hamisítás elrejti a sorozatszámát a hálózati interfészének (Wi-Fi vagy vezetékes) a helyi hálózaton.\nA MAC cím hamisítása általában biztonságosabb, mert segít abban,hogy elrejts földrajzi helyzetét. Azonban előfordulhat, hogy kapcsolati problémákat okozhat, vagy gyanúsnak tűnik."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Minden MAC cím hamisítása (alapértelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ne hamisítsa a MAC címeket"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "A Tor hidat és a helyi proxy-t később tudja beállítani, miután csatlakozott a hálózatra."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Köszöntjük a Tails-ben!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Hogy eligazodjon a Tails beállításai között, kattintson a <b>Tegyen egy túrát</b> gombra felül"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Feloldás"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Nyelv és régió"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Sikertelen a tartóstár vissza zárása."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Alapbeállítások"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Feloldás..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Nyelvi és régiós beállítások mentése"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "A titkosított tároló nem dekódolható ezzel a jelszóval."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Nyelv"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Billentyűzet kiosztás"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formátumok"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Időzóna"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Titkosított _Tartós tár"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Jelmondat megjelenítése"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Tartóstár beállítása"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Adja meg a jelszavát a tartóstár feloldásához"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Tartóstár vissza zárása"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "A tartós tára nyitva. Indítsa újra a Tails-t a visszazárásához."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_További beállítások"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "További beállítások mentése"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Tovább beállítások hozzá adása"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Hálózati konfiguráció"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ha az internet csatlakozás cenzorált, szűrt vagy proxyzot, akkor Tor hidat vagy lokális proxyt állíthat be. A teljesen offline munkához kapcsolja ki az összes hálózatot."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Csatlakozás közvetlenül a Tor hálózathoz (alapértelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Tor híd vagy helyi proxy beállítása"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Összes hálózatépítés letiltása"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Az alapértelmezett beállítások biztonságosak a legtöbb helyzetben. Az egyéni beállítások hozzáadásához nyomja meg a \"+\" gombot alább."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Adminisztrációs jelszó"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Ki (alapértelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC cím hamisítás"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Be (alapértelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Hálózati kapcsolat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows álcázás"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Be"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Ki"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -718,6 +532,11 @@ msgstr "Adjon meg jelszót a képernyő feloldáshoz."
msgid "Password"
msgstr "Jelszó"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Megerősít"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "A Tails ezen verziója ismert biztonsági problémákkal rendelkezik:"
@@ -814,35 +633,35 @@ msgstr "Nyitott Onion Áramkörök"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (csak olvasható)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} a {container_path} útvonalon"
@@ -851,14 +670,14 @@ msgstr "{partition_name} a {container_path} útvonalon"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} a {drive_name} drive-on"
@@ -867,42 +686,42 @@ msgstr "{partition_name} a {drive_name} drive-on"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Rossz jelszó vagy paraméterek"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Hiba a kötet feloldása során"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Sikertelen a(z) {volume_name} kötet feloldása:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1100,6 +919,130 @@ msgid ""
" ($(command_line))"
msgstr "Azonosítás szükséges a további szoftverei közül egy csomag eltávolításához ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Adminisztrátori jelszó"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Állítson be egy adminisztrátori jelszót, ha szükséges adminisztrációs feladatokat végezni. Egyébként az adminisztrátori jelszó tiltott a magasabb biztonság érdekében."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Adjon meg egy adminisztrátori jelszót"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Erősítse meg adminisztrációs jelszavát"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Kikapcsol"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC cím hamisítás"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "A MAC cím hamisítás elrejti a sorozatszámát a hálózati interfészének (Wi-Fi vagy vezetékes) a helyi hálózaton.\nA MAC cím hamisítása általában biztonságosabb, mert segít abban,hogy elrejts földrajzi helyzetét. Azonban előfordulhat, hogy kapcsolati problémákat okozhat, vagy gyanúsnak tűnik."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Minden MAC cím hamisítása (alapértelmezett)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ne hamisítsa a MAC címeket"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Hálózati konfiguráció"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ha az internet csatlakozás cenzorált, szűrt vagy proxyzot, akkor Tor hidat vagy lokális proxyt állíthat be. A teljesen offline munkához kapcsolja ki az összes hálózatot."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Csatlakozás közvetlenül a Tor hálózathoz (alapértelmezett)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Tor híd vagy helyi proxy beállítása"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Összes hálózatépítés letiltása"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "A Tor hidat és a helyi proxy-t később tudja beállítani, miután csatlakozott a hálózatra."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Köszöntjük a Tails-ben!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Nyelv és régió"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Alapbeállítások"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Titkosított _Tartós tár"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Tartóstár beállítása"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Adja meg a jelszavát a tartóstár feloldásához"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Tartóstár vissza zárása"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "A tartós tára nyitva. Indítsa újra a Tails-t a visszazárásához."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_További beállítások"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Tovább beállítások hozzá adása"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Az alapértelmezett beállítások biztonságosak a legtöbb helyzetben. Az egyéni beállítások hozzáadásához nyomja meg a \"+\" gombot alább."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Fájl konténerek"
diff --git a/hy.po b/hy.po
index 09a5794ad..3db3bc0fc 100644
--- a/hy.po
+++ b/hy.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ավելացնել"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Ետ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Չեղարկել"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Ավելացնել"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Ետ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Գաղտնագիր"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/id.po b/id.po
index 4ff3af0c9..3ef1d2cc1 100644
--- a/id.po
+++ b/id.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Langsung (default)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & Proxy "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Luring"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Tidak terkunci"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Gagal mengunci kembali penyimpanan menetap"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Membuka kunci..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Tidak dapat membuka penyimpanan terenkripsi dengan frasa sandi ini."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Pengaturan Tambahan"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Batal"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Tambah"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Kembali"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Password Admin"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Pemalsuan alamat MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Koneksi Jaringan"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Langsung (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Luring"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Aktif (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Nonaktif (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Matikan"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Mulai Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist gagal dengan kode {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup gagal dengan kode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr "live-persist gagal dengan kode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr "umount gagal dengan kode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Password Admin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Buat sandi administrasi Anda jika Anda perlu menjalankan tugas administrasi. Jika tidak, sandi administrasi dinonaktifkan untuk keamanan yang lebih baik."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Masukkan password admin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Konfirmasi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Konfirmasi password admin anda"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Matikan"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Kamuflase Jendela"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Opsi ini membuat Tails terlihat lebih seperti Microsoft Windows 10. Hal ini dapat berguna untuk menghindari kecurigaan di tempat umum."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Kamuflase Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Pemalsuan alamat MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Pemalsuan alamat MAC menyembunyikan nomor serial kartu jaringan Anda (Wi-fi atau kabel) ke jaringan lokal. Memasulkan alamat MAC biasanya lebih aman karena menyembunyikan lokasi geografis anda. Tapi itu mungkin juga membuat masalah konektivitas atau menimbulkan kecurigaan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Palsukan semua alamat MAC (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Jangan palsukan alamat MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Anda akan mengatur jembatan Tor dan proxy lokal nanti setelah terhubung ke jaringan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Selamat datang di Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Untuk panduin di pengaturan Tails, klik pada <b>Ambil tur</b> di atas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Tidak terkunci"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Bahasa & Wilayah"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Gagal mengunci kembali penyimpanan menetap"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Pengaturan Default"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Membuka kunci..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Simpan bahasa & pengaturan wilayah"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Tidak dapat membuka penyimpanan terenkripsi dengan frasa sandi ini."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Bahasa"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Tata Letak Keyboard"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Format"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona Waktu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Penyimpanan Menetap Terenkripsi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Tampilkan Kata Kunci"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurasi Penyimpanan Menetap"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Masukkan kata kunci untuk memprotect volume persistent"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Kunci Kembali Penyimpanan Menetap"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Penyimpanan Menetap Anda tidak terkunci. Memulai kembali Tails untuk menguncinya lagi."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Pengaturan Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Simpan Pengaturan Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Tambah pengaturan tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Konfigurasi Jaringan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Jika koneksi Internet Anda tersensor, tersaring atau terproxy, Anda dapat mengatur sebuah Tor bridge atau proxy lokal. Untuk sepenuhnya offline, Anda dapat menonaktifkan semua jaringan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Tersambung langsung ke Jaringan Tor (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Atur Tor bridge atau proxy lokal"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Nonaktifkan semua jaringan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Pengaturan default aman untuk banyak situasi. Untuk menambah pengaturan tambahan, tekan tombol \"+\" di bawah."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Password Admin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Nonaktif (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Pemalsuan alamat MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Aktif (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Koneksi Jaringan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Kamuflase Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr "Buat kata sandi untuk membuka kunci layar."
msgid "Password"
msgstr "Password "
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Konfirmasi"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Versi Tails ini telah mengetahui isu-isu keamanan:"
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Password Admin"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Buat sandi administrasi Anda jika Anda perlu menjalankan tugas administrasi. Jika tidak, sandi administrasi dinonaktifkan untuk keamanan yang lebih baik."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Masukkan password admin"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Konfirmasi password admin anda"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Matikan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Pemalsuan alamat MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Pemalsuan alamat MAC menyembunyikan nomor serial kartu jaringan Anda (Wi-fi atau kabel) ke jaringan lokal. Memasulkan alamat MAC biasanya lebih aman karena menyembunyikan lokasi geografis anda. Tapi itu mungkin juga membuat masalah konektivitas atau menimbulkan kecurigaan."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Palsukan semua alamat MAC (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Jangan palsukan alamat MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurasi Jaringan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Jika koneksi Internet Anda tersensor, tersaring atau terproxy, Anda dapat mengatur sebuah Tor bridge atau proxy lokal. Untuk sepenuhnya offline, Anda dapat menonaktifkan semua jaringan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Tersambung langsung ke Jaringan Tor (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Atur Tor bridge atau proxy lokal"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Nonaktifkan semua jaringan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Anda akan mengatur jembatan Tor dan proxy lokal nanti setelah terhubung ke jaringan."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Selamat datang di Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Bahasa & Wilayah"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Pengaturan Default"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Penyimpanan Menetap Terenkripsi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurasi Penyimpanan Menetap"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Masukkan kata kunci untuk memprotect volume persistent"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Kunci Kembali Penyimpanan Menetap"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Penyimpanan Menetap Anda tidak terkunci. Memulai kembali Tails untuk menguncinya lagi."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Pengaturan Tambahan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Tambah pengaturan tambahan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Pengaturan default aman untuk banyak situasi. Untuk menambah pengaturan tambahan, tekan tombol \"+\" di bawah."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Wadah Berkas"
diff --git a/is.po b/is.po
index 7b6167c85..51eed4c0f 100644
--- a/is.po
+++ b/is.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Ræsa"
msgid "_Exit"
msgstr "_Hætta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Beint (sjálfgefið)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Brú og milliþjónn"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Ónettengt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Aflæsa"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Tókst ekki að læsa aftur varanlegri gagnageymslu."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Aflæsi…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Get ekki aflæst dulritaðri gagnageymslu með þessum lykilfrasa."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Aukastillingar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Hætta við"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Bæta við"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Til baka"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "L_ykilorð kerfisstjórnunar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Dulbúningur _MAC-vistfangs"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Nettenging"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Beint (sjálfgefið)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Brú og milliþjónn"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Ónettengt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Kveikt (sjálfgefið)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Kveikt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Slökkt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Slökkt (sjálfgefið)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Slökkva"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "Ræ_sa Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist mistókst með svarkóða {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup mistókst með svarkóða {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr "live-persist mistókst með svarkóða {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr "umount mistókst með svarkóða {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Lykilorð kerfisstjórnunar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Settu upp lykilorð fyrir kerfisstjórnun ef þú þarft að sýsla með kerfisstillingar. Annars er lykilorð fyrir kerfisstjórnun haft óvirkt í öryggisskyni."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Settu inn lykilorð fyrir kerfisstjórnun"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Staðfesta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Staðfestu lykilorð kerfisstjórnunar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Gera óvirkt"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows dulargerfi"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Þessi kostur lætur Tails líta út eins og Microsoft Windows 10. Þetta getur reynst vel til að draga ekki að sér athygli á opinberum stöðum."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 dulargerfi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Dulbúningur MAC-vistfangs"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Dulbúningur MAC-vistfangs felur raðnúmer netkortsins (Wi-Fi eða kapall) fyrir staðarnetinu. Dulbúningur MAC-vistfangs er almennt öruggara þar sem það hjálpar til við að fela staðsetningu þína. En það getur aftur valdið vandamálum í tengingum eða litið grunsamlega út."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Dulbúa öll MAC-vistföng (sjálfgefið)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ekki dulbúa MAC-vistföng"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Þú munt setja upp Tor-brú og staðværan milliþjón (proxy) síðar eftir að hafa tengst neti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkomin í Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Til að fá leiðsögn um stillingar Tails, smelltu á <b>Fara í skoðunarferð</b> hér fyrir ofan"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Aflæsa"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Tungumál og landsvæði"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Tókst ekki að læsa aftur varanlegri gagnageymslu."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Sjálfgefnar stillingar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Aflæsi…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Vista tungumála- og svæðisstillingar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Get ekki aflæst dulritaðri gagnageymslu með þessum lykilfrasa."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "Tungumá_l"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "Ly_klaborðsuppsetning"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "S_nið"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tímabelti"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Dulrituð varanleg _gagnageymsla"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Birta lykilsetningu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Stilla varanlega gagnageymslu"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Settu inn lykilfrasann til að aflæsa varanlegu gagnageymslunni"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Læsa aftur varanlegri gagnageymslu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Varanlega gagnageymslan þín er ólæst. Endurræstu Tails til að læsa henni aftur."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Viðbót_arstillingar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Vista aukastillingar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Bæta við aukastillingum"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Stillingar netkerfis"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ef Internet-tenging þessarar tölvu er ritskoðuð, síuð eða beint í gegnum milliþjón, þá ættir þú að stilla Tor-brú eða milliþjón. Til að vinna án nettengingar geturðu gert netvinnslu óvirka."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Tengjast beint við Tor-netið (sjálfgefið)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Stilla Tor-brú eða staðværan milliþjón (proxy)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Afvirkja alla netvinnslu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Sjálfgefnar stillingar eru í flestum tilfellum nógu öruggar. Til að bæta við sérsniðnum stillingum, ýttu á \"+\" hnappinn hér fyrir neðan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "L_ykilorð kerfisstjórnunar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Slökkt (sjálfgefið)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Dulbúningur _MAC-vistfangs"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Kveikt (sjálfgefið)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Nettenging"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows dulargerfi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Kveikt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Slökkt"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr "Settu upp lykilorð til að aflæsa skjánum."
msgid "Password"
msgstr "Lykilorð"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Staðfesta"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Þessi útgáfa Tails er með þekkt öryggisvandamál:"
@@ -806,35 +625,35 @@ msgstr "Opnar Onion-rásir"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} gagnageymsla"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (skrifvarið)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} í {container_path}"
@@ -843,14 +662,14 @@ msgstr "{partition_name} í {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} á {drive_name}"
@@ -859,42 +678,42 @@ msgstr "{partition_name} á {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Rangt aðgangsorð eða viðföng"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Villa við að aflæsa gagnageymslu"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Gat ekki aflæst gagnageymslu {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Eitt eða fleiri forrit eru að nota gagnageymsluna."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Gat ekki læst gagnageymslu {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Ekki tókst að læsa gagnageymslunni"
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr "Auðkenningar er krafist til að fjarlægja pakka úr viðbótarhugbúnaðnum þínum ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Lykilorð kerfisstjórnunar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Settu upp lykilorð fyrir kerfisstjórnun ef þú þarft að sýsla með kerfisstillingar. Annars er lykilorð fyrir kerfisstjórnun haft óvirkt í öryggisskyni."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Settu inn lykilorð fyrir kerfisstjórnun"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Staðfestu lykilorð kerfisstjórnunar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Gera óvirkt"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Dulbúningur MAC-vistfangs"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Dulbúningur MAC-vistfangs felur raðnúmer netkortsins (Wi-Fi eða kapall) fyrir staðarnetinu. Dulbúningur MAC-vistfangs er almennt öruggara þar sem það hjálpar til við að fela staðsetningu þína. En það getur aftur valdið vandamálum í tengingum eða litið grunsamlega út."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Dulbúa öll MAC-vistföng (sjálfgefið)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ekki dulbúa MAC-vistföng"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Stillingar netkerfis"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ef Internet-tenging þessarar tölvu er ritskoðuð, síuð eða beint í gegnum milliþjón, þá ættir þú að stilla Tor-brú eða milliþjón. Til að vinna án nettengingar geturðu gert netvinnslu óvirka."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Tengjast beint við Tor-netið (sjálfgefið)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Stilla Tor-brú eða staðværan milliþjón (proxy)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Afvirkja alla netvinnslu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Þú munt setja upp Tor-brú og staðværan milliþjón (proxy) síðar eftir að hafa tengst neti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkomin í Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Tungumál og landsvæði"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Sjálfgefnar stillingar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Dulrituð varanleg _gagnageymsla"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Stilla varanlega gagnageymslu"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Settu inn lykilfrasann til að aflæsa varanlegu gagnageymslunni"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Læsa aftur varanlegri gagnageymslu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Varanlega gagnageymslan þín er ólæst. Endurræstu Tails til að læsa henni aftur."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Viðbót_arstillingar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Bæta við aukastillingum"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Sjálfgefnar stillingar eru í flestum tilfellum nógu öruggar. Til að bæta við sérsniðnum stillingum, ýttu á \"+\" hnappinn hér fyrir neðan."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Skráagámar"
diff --git a/it.po b/it.po
index ae90dbdae..abd27e884 100644
--- a/it.po
+++ b/it.po
@@ -32,8 +32,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Bridge & proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Sblocca"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Impossibile ribloccare il volume persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Sbloccaggio in corso…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Impossibile sbloccare il volume cifrato con questa password."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Impostazioni aggiuntive"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Annulla"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Aggiungi"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Indietro"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Password di amministratore"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Spoofing indirizzo _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Connessioni di rete"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Diretta (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "On (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Off (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Arresto"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Avvia Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "predefinito:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist fallito con codice di ritorno {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup fallito con codice di ritorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -209,7 +211,7 @@ msgid ""
"{stderr}"
msgstr "live-persist fallito con codice di ritorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -217,225 +219,37 @@ msgid ""
"{stderr}"
msgstr "umount fallito con codice di ritorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Password di amministrazione"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Imposta una password di amministratore se devi eseguire azioni di amministrazione. Altrimenti, la password di amministratore verrà disabilitata per maggiore sicurezza."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Inserire una password di amministrazione"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Conferma"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confermare la password di amministrazione"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Disabilita"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Mimetizzazione Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Questa opzione fa sembrare Tails come Microsoft Windows 10. Può essere utile per non attirare l'attenzione in luoghi pubblici."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuffamento da Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Spoofing indirizzo MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Lo spoofing dell'indirizzo MAC nasconde il numero seriale della tua interfaccia di rete (Wi-Fi o cablata) alla rete locale. Lo spoofing degli indirizzi MAC di solito è più sicuro ed aiuto a nascondere la posizione geografica. Ma potrebbe anche creare problemi di connessione o sembrare sospetto."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof di tutti gli indirizzi MAC (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nessuno spoof degli indirizzi MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Configurerai il bridge Tor e il proxy locale più tardi dopo la connessione a una rete."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Benvenuto in Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Per farti guidare tra le impostazioni di Tails, clicca <b>Fai un Tour</b> sopra"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Sblocca"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Lingua & Regione"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Impossibile ribloccare il volume persistente."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Impostazioni predefinite"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Sbloccaggio in corso…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Salvare impostazioni di Lingua & Regione"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Impossibile sbloccare il volume cifrato con questa password."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Lingua"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Disposizione tastiera"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formati"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "Fuso _orario"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Volume persistente cifrato"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostra passphrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configura volume persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Inserisci la tua passphrase per sbloccare il volume persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Riblocca volume persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Il tuo volume persistente è sbloccato. Riavvia Tails per ribloccarlo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Impostazioni aggiuntive"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Salvare Impostazioni aggiuntive"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Aggiungi un'impostazione aggiuntiva"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configurazione di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Se la tua connessione internet è censurata, filtrata o dietro un proxy, puoi configurare un bridge Tor o un proxy locale. Per lavorare completamente offline, puoi disattivare tutta la rete."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connetti direttamente alla rete Tor (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configura un bridge Tor od un proxy locale"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Disattiva tutta l'attività di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Le impostazioni predefinite vanno bene nella maggior parte dei casi. Per aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Password di amministratore"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Off (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Spoofing indirizzo _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "On (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Connessioni di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Mimetizzazione _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -734,6 +548,11 @@ msgstr "Imposta una password per sbloccare lo schermo."
msgid "Password"
msgstr "Password"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Conferma"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Questa versione di Tails ha problemi di sicurezza noti:"
@@ -830,35 +649,35 @@ msgstr "Apri Circuiti Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Sola lettura)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -867,14 +686,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} su {drive_name}"
@@ -883,42 +702,42 @@ msgstr "{partition_name} su {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Password o parametri non corretti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Errore sblocco volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Impossibile sbloccare il volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Una o più applicazioni stanno tenendo occupato il volume."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Impossibile bloccare il volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Blocco del volume fallito"
@@ -1116,6 +935,130 @@ msgid ""
" ($(command_line))"
msgstr "È richiesta l'autenticazione per rimuovere un pacchetto dai tuoi software aggiuntivi ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Password di amministrazione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Imposta una password di amministratore se devi eseguire azioni di amministrazione. Altrimenti, la password di amministratore verrà disabilitata per maggiore sicurezza."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Inserire una password di amministrazione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confermare la password di amministrazione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Disabilita"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Spoofing indirizzo MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Lo spoofing dell'indirizzo MAC nasconde il numero seriale della tua interfaccia di rete (Wi-Fi o cablata) alla rete locale. Lo spoofing degli indirizzi MAC di solito è più sicuro ed aiuto a nascondere la posizione geografica. Ma potrebbe anche creare problemi di connessione o sembrare sospetto."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof di tutti gli indirizzi MAC (predefinito)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nessuno spoof degli indirizzi MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configurazione di rete"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Se la tua connessione internet è censurata, filtrata o dietro un proxy, puoi configurare un bridge Tor o un proxy locale. Per lavorare completamente offline, puoi disattivare tutta la rete."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connetti direttamente alla rete Tor (predefinito)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configura un bridge Tor od un proxy locale"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Disattiva tutta l'attività di rete"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Configurerai il bridge Tor e il proxy locale più tardi dopo la connessione a una rete."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Benvenuto in Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Lingua & Regione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Impostazioni predefinite"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Volume persistente cifrato"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configura volume persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Inserisci la tua passphrase per sbloccare il volume persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Riblocca volume persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Il tuo volume persistente è sbloccato. Riavvia Tails per ribloccarlo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Impostazioni aggiuntive"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Aggiungi un'impostazione aggiuntiva"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Le impostazioni predefinite vanno bene nella maggior parte dei casi. Per aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Contenitori di file"
diff --git a/ja.po b/ja.po
index 1c0c315db..dca465a36 100644
--- a/ja.po
+++ b/ja.po
@@ -26,8 +26,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "起動 (_L)"
msgid "_Exit"
msgstr "終了 (_E)"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "直接（デフォルト）"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "ブリッジ & プロキシ"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "オフライン"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "ロック解除"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "永続的ストレージの再ロックに失敗しました。"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "アンロック..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "このパスフレーズで、暗号化されたストレージをアンロックできません。"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "追加設定"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "キャンセル"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "追加"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "戻る"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "管理パスワード (_A)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "MAC アドレススプーフィング (_M)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "ネットワーク接続 (_N)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "直接（デフォルト）"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "ブリッジ & プロキシ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "オフライン"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "オン（デフォルト）"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "オン"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "オフ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "オフ（デフォルト）"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "停止"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "Tails を起動 (_S)"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persistが失敗しました。再開コードは {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -195,7 +197,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup が失敗しました。再開コードは {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -203,7 +205,7 @@ msgid ""
"{stderr}"
msgstr "live-persistが失敗しました。再開コードは {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -211,225 +213,37 @@ msgid ""
"{stderr}"
msgstr "unmount が失敗しました。再開コードは {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "管理パスワード"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "管理タスクを実行する必要がある場合は、管理パスワードを設定します。それ以外の場合は、管理パスワードを無効にしてセキュリティを強化します。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "管理パスワードを入力してください"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "確認"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "管理パスワードを確認する"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "無効する"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windowsカモフラージュ"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "このオプションはTailsをよりMicrosoft Windows 10にみえるようにします。これは注意を引く疑いを避けるために公共の場所などで便利かもしれません。"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10カモフラージュ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC アドレススプーフィング"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC アドレススプーフィングは、ネットワークインターフェイス (Wi-Fi または有線) のシリアル番号をローカルネットワークに非表示にします。MAC アドレススプーフィングは、地理的な場所を隠すのに役立つため、一般的に安全です。しかし、接続に問題が発生したり、不審に見える可能性もあります。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "全てのMACアドレスを詐称する(初期設定値)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MACアドレスを詐称しない"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Torブリッジやローカルプロキシはネットワークと接続する後に設定します。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tailsへようこそ！"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Tailsの設定に案内してもらうには、上記に<b>ツアーに参加する</b>をクリックして下さい。"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "ロック解除"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "言語 & 地域"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "永続的ストレージの再ロックに失敗しました。"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "デフォルト設定"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "アンロック..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "言語と領域の設定を保存する"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "このパスフレーズで、暗号化されたストレージをアンロックできません。"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "言語 (_L)"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "キーボード配列 (_K)"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "フォーマット (_F)"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "タイムゾーン (_T)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "暗号化された永続的ストレージ (_P)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "パスフレーズの表示"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "永続的ストレージの構成"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "永続的ストレージのロックを解除するためのパスフレーズを入力してください"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "永続的ストレージの再ロック"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "永続的ストレージのロックが解除されました。もう一度ロックするには、 Tails を再起動してください。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "追加設定 (_A)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "追加設定を保存"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "追加設定を追加"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "ネットワーク設定"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "もしインターネット接続は検閲され、フィルターされる場合、Torブリッジやローカルプロキシを設定できます。完全にオフラインで作業したい場合、ネットワーク機能を無効にできます。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Torネットワークに直接接続する (デフォルト)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Torブリッジやローカルプロキシを構成する"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "ネットワーク能力を全て無効化"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "デフォルト設定は大抵の場合安全です。カスタム設定を追加するのに、下の\"+\"ボタンを押して下さい。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "管理パスワード (_A)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "オフ（デフォルト）"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "MAC アドレススプーフィング (_M)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "オン（デフォルト）"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "ネットワーク接続 (_N)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windowsカモフラージュ"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "オン"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "オフ"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -728,6 +542,11 @@ msgstr "画面をアンロックするためのパスワードを設定してく
msgid "Password"
msgstr "パスワード"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "確認"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tailsのこのバージョンには、既知のセキュリティ問題が存在します:"
@@ -824,35 +643,35 @@ msgstr "Onionサーキットを開きます"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} ボリューム"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (読み取り専用)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{container_path} にある{partition_name}"
@@ -861,14 +680,14 @@ msgstr "{container_path} にある{partition_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{drive_name} にある {partition_name}"
@@ -877,42 +696,42 @@ msgstr "{drive_name} にある {partition_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "パスフレーズやパラメーターが間違っています"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "ボリュームのロック解除が失敗しました"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "ボリュームのロック解除ができませんでした {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "ボリュームのロックができませんでした {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1110,6 +929,130 @@ msgid ""
" ($(command_line))"
msgstr "追加ソフトウェアからパッケージを外すには認証が必要です ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "管理パスワード"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "管理タスクを実行する必要がある場合は、管理パスワードを設定します。それ以外の場合は、管理パスワードを無効にしてセキュリティを強化します。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "管理パスワードを入力してください"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "管理パスワードを確認する"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "無効する"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC アドレススプーフィング"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC アドレススプーフィングは、ネットワークインターフェイス (Wi-Fi または有線) のシリアル番号をローカルネットワークに非表示にします。MAC アドレススプーフィングは、地理的な場所を隠すのに役立つため、一般的に安全です。しかし、接続に問題が発生したり、不審に見える可能性もあります。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "全てのMACアドレスを詐称する(初期設定値)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MACアドレスを詐称しない"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "ネットワーク設定"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "もしインターネット接続は検閲され、フィルターされる場合、Torブリッジやローカルプロキシを設定できます。完全にオフラインで作業したい場合、ネットワーク機能を無効にできます。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Torネットワークに直接接続する (デフォルト)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Torブリッジやローカルプロキシを構成する"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "ネットワーク能力を全て無効化"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Torブリッジやローカルプロキシはネットワークと接続する後に設定します。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Tailsへようこそ！"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "言語 & 地域"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "デフォルト設定"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "暗号化された永続的ストレージ (_P)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "永続的ストレージの構成"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "永続的ストレージのロックを解除するためのパスフレーズを入力してください"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "永続的ストレージの再ロック"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "永続的ストレージのロックが解除されました。もう一度ロックするには、 Tails を再起動してください。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "追加設定 (_A)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "追加設定を追加"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "デフォルト設定は大抵の場合安全です。カスタム設定を追加するのに、下の\"+\"ボタンを押して下さい。"
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "ファイルコンテナ"
diff --git a/ka.po b/ka.po
index 62e1ac970..e621e2c81 100644
--- a/ka.po
+++ b/ka.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "პირდაპირი (ნაგულისხმევი)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "გადამცემი და პროქსი"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "კავშირგარეშე"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "გახსნა"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "მუდმივი მეხსიერების ხელახლა ჩაკეტვა ვერ მოხერხდა."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "იხსნება..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "დაშიფრული საცავის ამ პაროლით გახსნა ვერ ხერხდება."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "დამატებითი პარამეტრები"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "გაუქმება"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "დამატება"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "უკან"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_მთავარი პაროლი"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC-მისამართის გადაკეთება"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_ქსელთან კავშირი"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "პირდაპირი (ნაგულისხმევი)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "გადამცემი და პროქსი"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "კავშირგარეშე"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "ჩართ. (ნაგულისხმევი)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "ჩართ."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "გამორთ."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "გამორთ. (ნაგულისხმევი)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "დახურვა"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_გაეშვას Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist არ მუშაობს, შეცდომის კოდია {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup არ მუშაობს, შეცდომის კოდია {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr "live-persist არ მუშაობს, შეცდომის კოდია {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr "umount არ მუშაობს, შეცდომის კოდია {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "მთავარი პაროლი"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "დააყენეთ მთავარი პაროლი, თუ გესაჭიროებათ სამართავი მოქმედებების შესრულება. სხვა შემთხვევაში, მთავარი პაროლი გამორთული იქნება დამატებითი უსაფრთხოებისთვის."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "მიუთითეთ მთავარი პაროლი"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "დაადასტურეთ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "მთავარი პაროლის დადასტურება"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "გამორთვა"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-ად შენიღბვა"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "შედეგად, Tails გამოჩნდება როგორც Microsoft Windows 10. გამოსადეგია, ყურადღების ზედმეტად მიპყრობის ასარიდებლად, საჯარო ადგილებში."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10-ად შენიღბვა"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC-მისამართის გადაკეთება"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC-მისამართის გადაკეთებით დაიმალება თქვენი ქსელის (უსადენოს ან სადენიანის) სერიული ნომერი, ადგილობრივ ქსელში. MAC-მისამართების გადაკეთება ზოგადად აუმჯობესებს უსაფრთხოებას და გეხმარებათ თქვენი მდებარეობის უკეთ დამალვაში. თუმცა, შესაძლოა ხარვეზები გამოიწვიოს დაკავშირების ან გამოჩნდეს საეჭვოდ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "MAC-მისამართების გადაკეთება (ნაგულისხმევი)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC-მისამართების გადაკეთების გარეშე"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Tor-ის გადამცემი ხიდები და ადგილობრივი პროქსი უნდა გამართოთ მოგვიანებით, ქსელთან დაკავშირების შემდგომ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "მოგესალმებათ Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "თუ გსურთ მითითებების ხილვა Tails-ის გასამართად, დააწკაპეთ <b>გზამკვლევს</b> ზემოთ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "გახსნა"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "ენა და რეგიონი"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "მუდმივი მეხსიერების ხელახლა ჩაკეტვა ვერ მოხერხდა."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ნაგულისხმევი პარამეტრები"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "იხსნება..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "ენისა და რეგიონის პარამეტრების შენახვა"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "დაშიფრული საცავის ამ პაროლით გახსნა ვერ ხერხდება."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_ენა"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_კლავიატურის განლაგება"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_ფორმატები"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_დროის სარტყელი"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "დაშიფრული _მუდმივი მეხსიერება"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "პაროლის ჩვენება"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "მუდმივი მეხსიერების გამართვა"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "შეიყვანეთ თქვენი პაროლი მუდმივი მეხიერების გასახსნელად"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "მუდმივი მეხსიერების ხელახლა ჩაკეტვა"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "თქვენი მუდმივი მეხსიერება გახსნილია. მის ჩასაკეტად, ხელახლა გაუშვით Tails."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_დამატებითი პარამეტრები"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "დამატებითი პარამეტრების შენახვა"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "დამატებითი პარამეტრების დამატება"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "ქსელის გამართვა"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "თუ თქვენი ინტერნეტკავშირი ცენზურის ქვეშაა, იფილტრება ან პროქსის გავლით მუშაობს, შეგიძლიათ გამართოთ Tor-გადამცემი ან ადგილობრივი პროქსი. სრულად კავშირგარეშე რეჟიმში სამუშაოდ, შეგიძლიათ ყველა ქსელი გათიშოთ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "პირადაპირ Tor-ქსელთან დაკავშირება (ნაგულისხმევი)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Tor-გადამცემის ან ადგილობრივი პროქსის გამართვა"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "ყველა ქსელის გათიშვა"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "ნაგულისხმევი პარამეტრები უსაფრთხოა უმეტეს შემთხვევაში. სასურველი პარამეტრის დასამატებლად, დააჭირეთ „+“ ღილაკს ქვემოთ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_მთავარი პაროლი"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "გამორთ. (ნაგულისხმევი)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC-მისამართის გადაკეთება"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "ჩართ. (ნაგულისხმევი)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_ქსელთან კავშირი"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-ად შენიღბვა"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "ჩართ."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "გამორთ."
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr "დააყენეთ პაროლი ეკრანის გა
msgid "Password"
msgstr "პაროლი"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "დაადასტურეთ"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tails-ის ამ ვერსიას უსაფრთხოების ცნობილი ხარვეზები გააჩნია:"
@@ -808,35 +627,35 @@ msgstr "Onion-წრედების გახსნა"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} დანაყოფი"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (მხოლოდ-წაკითხვით)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} – {container_path}"
@@ -845,14 +664,14 @@ msgstr "{partition_name} – {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} – {drive_name}"
@@ -861,42 +680,42 @@ msgstr "{partition_name} – {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "არასწორი პაროლი ან პარამეტრები"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "შეცდომა დანაყოფის გახსნისას"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "ვერ მოხერხდა გახსნა დანაყოფის {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "დანაყოფი დაკავებულია ერთი ან რამდენიმე პროგრამის მიერ."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "ვერ მოხერხდა ჩაკეტვა დანაყოფის {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "დანაყოფის ჩაკეტვა ვერ მოხერხდა"
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr "ანგარიშის მონაცემების მითითებაა საჭირო პაკეტის დამატებითი პროგრამიდან ამოსაშლელად ($(command_line)"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "მთავარი პაროლი"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "დააყენეთ მთავარი პაროლი, თუ გესაჭიროებათ სამართავი მოქმედებების შესრულება. სხვა შემთხვევაში, მთავარი პაროლი გამორთული იქნება დამატებითი უსაფრთხოებისთვის."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "მიუთითეთ მთავარი პაროლი"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "მთავარი პაროლის დადასტურება"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "გამორთვა"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-მისამართის გადაკეთება"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC-მისამართის გადაკეთებით დაიმალება თქვენი ქსელის (უსადენოს ან სადენიანის) სერიული ნომერი, ადგილობრივ ქსელში. MAC-მისამართების გადაკეთება ზოგადად აუმჯობესებს უსაფრთხოებას და გეხმარებათ თქვენი მდებარეობის უკეთ დამალვაში. თუმცა, შესაძლოა ხარვეზები გამოიწვიოს დაკავშირების ან გამოჩნდეს საეჭვოდ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "MAC-მისამართების გადაკეთება (ნაგულისხმევი)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC-მისამართების გადაკეთების გარეშე"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "ქსელის გამართვა"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "თუ თქვენი ინტერნეტკავშირი ცენზურის ქვეშაა, იფილტრება ან პროქსის გავლით მუშაობს, შეგიძლიათ გამართოთ Tor-გადამცემი ან ადგილობრივი პროქსი. სრულად კავშირგარეშე რეჟიმში სამუშაოდ, შეგიძლიათ ყველა ქსელი გათიშოთ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "პირადაპირ Tor-ქსელთან დაკავშირება (ნაგულისხმევი)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Tor-გადამცემის ან ადგილობრივი პროქსის გამართვა"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "ყველა ქსელის გათიშვა"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Tor-ის გადამცემი ხიდები და ადგილობრივი პროქსი უნდა გამართოთ მოგვიანებით, ქსელთან დაკავშირების შემდგომ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "მოგესალმებათ Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "ენა და რეგიონი"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ნაგულისხმევი პარამეტრები"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "დაშიფრული _მუდმივი მეხსიერება"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "მუდმივი მეხსიერების გამართვა"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "შეიყვანეთ თქვენი პაროლი მუდმივი მეხიერების გასახსნელად"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "მუდმივი მეხსიერების ხელახლა ჩაკეტვა"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "თქვენი მუდმივი მეხსიერება გახსნილია. მის ჩასაკეტად, ხელახლა გაუშვით Tails."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_დამატებითი პარამეტრები"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "დამატებითი პარამეტრების დამატება"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "ნაგულისხმევი პარამეტრები უსაფრთხოა უმეტეს შემთხვევაში. სასურველი პარამეტრის დასამატებლად, დააჭირეთ „+“ ღილაკს ქვემოთ."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "ფაილის სათავსები"
diff --git a/kab.po b/kab.po
index cb869557c..feb1c5e98 100644
--- a/kab.po
+++ b/kab.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 154713934..b50f40bec 100644
--- a/kk.po
+++ b/kk.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Қосу"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Болдырмау"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Қосу"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Растау"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr "Экранның құлпын ашу үшін құпия сөзді ор
msgid "Password"
msgstr "Құпиясөз"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Растау"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tails-дің бұл нұсқасы белгілі қауіпсіздік мәселелеріне ие:"
@@ -807,35 +626,35 @@ msgstr "Onion тізбектерін ашу"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size}Көлемі"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Тек-Оқу)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -844,14 +663,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -860,42 +679,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Қате құпия сөз немесе параметрлер"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Томның құлпын ашу қатесі"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Томның құлпын ашу мүмкін болмады {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr "Түпнұсқалық растама пакетті қосымша бағдарламалық құралдан жою үшін қажет ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Файл контейнерлері"
diff --git a/km.po b/km.po
index 11021ed39..7d55d1cfa 100644
--- a/km.po
+++ b/km.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "បោះបង់"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "ក្រៅបណ្តាញ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "បន្ថែម"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "ថយក្រោយ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "បោះបង់"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "ក្រៅបណ្តាញ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "បន្ថែម"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "ថយក្រោយ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "បើក"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr "បិទ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
+msgstr "បិទ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "យល់ព្រម"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "បិទការភ្ជាប់បណ្ដាញទាំងអស់"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "បើក"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "បិទ"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "ពាក្យសម្ងាត់"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "យល់ព្រម"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "កំណែរបស់ Tails នេះគឺស្គាល់បញ្ហាសុវត្ថិភាព៖"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "បិទការភ្ជាប់បណ្ដាញទាំងអស់"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/kn.po b/kn.po
index c547c82da..9193c221f 100644
--- a/kn.po
+++ b/kn.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "ವಿಂಡೋಸ್ ಮಾಯಾಜಾಲ"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ko.po b/ko.po
index 36fd39f3c..8ba8562cd 100644
--- a/ko.po
+++ b/ko.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "직접 연결 (기본값)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "브릿지 및 프록시"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "오프라인"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "잠금 해제"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "퍼시스턴트 저장소 재잠금 실패"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "잠금 해제중..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "이 비밀번호로 암호화 저장소를 열 수 없습니다."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "추가 설정"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "취소"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "추가"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "뒤로"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_관리자 비밀번호"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC 주소 속이기"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_네트워크 연결"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "직접 연결 (기본값)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "브릿지 및 프록시"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "오프라인"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "켜짐 (기본값)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "켜기"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "끄기"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "꺼짐 (기본값)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "종료"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Tails 시작"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -192,7 +194,7 @@ msgid ""
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -200,225 +202,37 @@ msgid ""
"{stderr}"
msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "관리 비밀번호"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "관리자 작업을 수행해야 하는 경우 관리자 암호를 설정하십시오. 보안 향상을 위해 관리자 암호는 설정하지 않는 한 비활성화됩니다."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "관리자 암호 입력"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "확인"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "관리자 암호 확인"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "비활성화"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "윈도우로 위장"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "이 옵션은 Tails를 마이크로소프트 윈도우 10처럼 보이게 합니다. 공공장소에서 의심을 줄이는 데 유용할 수 있습니다."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "마이크로소프트 윈도우 10 위장"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC 주소 스푸핑"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC 주소를 속이면 로컬 네트워크에서 귀하의 네트워크 인터페이스(와이파이 혹은 유선)의 시리얼 번호를 숨길 수 있습니다. MAC 주소를 속이는 것이 지리적 위치를 숨기는 데 도움이 되므로 보통 더 안전합니다. 하지만 연결 문제가 생기거나 의심을 살 수도 있습니다."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "MAC 주소 속이기 (기본값)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC 주소 속이지 않기"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "네트워크에 연결한 뒤 나중에 Tor 브릿지와 로컬 프록시 설정을 하게 됩니다."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tails에 오신 걸 환영합니다!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Tails의 설정에서 이끌리려면 상방의<b>둘러보기</b>에 클릭하십시오."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "잠금 해제"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "언어 및 지역"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "퍼시스턴트 저장소 재잠금 실패"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "기본 설정"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "잠금 해제중..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "언어 및 지역 설정 저장"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "이 비밀번호로 암호화 저장소를 열 수 없습니다."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_언어"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_키보드 배열"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_포맷"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_시간대"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "암호화된 _영구 저장소"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "비밀번호 보기"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "퍼시스턴트 저장소 설정"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "비밀번호를 입력하여 퍼시스턴트 저장소를 여세요"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "퍼시스턴트 저장소 다시 잠금"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "퍼시스턴트 저장소가 열렸습니다. 다시 잠그려면 Tails를 재시작하세요."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_추가 설정"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "추가 설정 저장"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "추가 설정 추가"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "네트워크 설정"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "인터넷 연결이 검열, 필터, 혹은 프록시를 사용한다면 Tor 브릿지나 로컬 프록시를 설정할 수 있습니다. 완전히 오프라인으로 작업하고 싶다면, 네트워크 연결을 비활성화 할 수 있습니다."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Tor 네트워크에 직접 연결 (기본값)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Tor 브릿지나 로컬 프록시 설정"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr " 네트워크 연결을 비활성화"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "기본 설정은 대부분의 상황에서 안전합니다. 사용자 설정을 추가하려면 아래 \"+\" 버튼을 누르세요."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_관리자 비밀번호"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "꺼짐 (기본값)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC 주소 속이기"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "켜짐 (기본값)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_네트워크 연결"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_윈도우로 위장"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "켜기"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "끄기"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -717,6 +531,11 @@ msgstr "화면 잠금 해지를 위해서 비밀번호를 만드세요."
msgid "Password"
msgstr "비밀번호"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "확인"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "지금 버전 Tails은 보안에 문제가 있습니다."
@@ -813,35 +632,35 @@ msgstr "어니언 회로 열기"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} 음량"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (읽기 전용)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} 에 있는 {container_path}"
@@ -850,14 +669,14 @@ msgstr "{partition_name} 에 있는 {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -866,42 +685,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "틀린 비밀번호"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "볼륨 잠금해지 오류"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "볼륨 잠금해지를 하지 못했습니다. {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "볼륨 잠금해지가 되지 않았습니다. {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1099,6 +918,130 @@ msgid ""
" ($(command_line))"
msgstr "추가 소프트웨어에서($(command_line)) 페키지를 제거하실려면 인증이 필요합니다."
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "관리 비밀번호"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "관리자 작업을 수행해야 하는 경우 관리자 암호를 설정하십시오. 보안 향상을 위해 관리자 암호는 설정하지 않는 한 비활성화됩니다."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "관리자 암호 입력"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "관리자 암호 확인"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "비활성화"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC 주소 스푸핑"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC 주소를 속이면 로컬 네트워크에서 귀하의 네트워크 인터페이스(와이파이 혹은 유선)의 시리얼 번호를 숨길 수 있습니다. MAC 주소를 속이는 것이 지리적 위치를 숨기는 데 도움이 되므로 보통 더 안전합니다. 하지만 연결 문제가 생기거나 의심을 살 수도 있습니다."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "MAC 주소 속이기 (기본값)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC 주소 속이지 않기"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "네트워크 설정"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "인터넷 연결이 검열, 필터, 혹은 프록시를 사용한다면 Tor 브릿지나 로컬 프록시를 설정할 수 있습니다. 완전히 오프라인으로 작업하고 싶다면, 네트워크 연결을 비활성화 할 수 있습니다."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Tor 네트워크에 직접 연결 (기본값)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Tor 브릿지나 로컬 프록시 설정"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr " 네트워크 연결을 비활성화"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "네트워크에 연결한 뒤 나중에 Tor 브릿지와 로컬 프록시 설정을 하게 됩니다."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Tails에 오신 걸 환영합니다!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "언어 및 지역"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "기본 설정"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "암호화된 _영구 저장소"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "퍼시스턴트 저장소 설정"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "비밀번호를 입력하여 퍼시스턴트 저장소를 여세요"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "퍼시스턴트 저장소 다시 잠금"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "퍼시스턴트 저장소가 열렸습니다. 다시 잠그려면 Tails를 재시작하세요."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_추가 설정"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "추가 설정 추가"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "기본 설정은 대부분의 상황에서 안전합니다. 사용자 설정을 추가하려면 아래 \"+\" 버튼을 누르세요."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "파일 컨테이너"
diff --git a/lt.po b/lt.po
index f39612815..3868d3efe 100644
--- a/lt.po
+++ b/lt.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 18:31+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn(a)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 "Pa_leisti"
msgid "_Exit"
msgstr "Iš_eiti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Tiesioginis (numatytasis)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Tinklų tiltas ir įgaliotasis serveris"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Nepasiekiama(-s)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Atrakinti"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nepavyko iš naujo užrakinti ilgalaikį kaupiklį."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Atrakinama…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nepavyksta su šia slaptafraze atrakinti ilgalaikio kaupiklio."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Papildomi nustatymai"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Atsisakyti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Pridėti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Atgal"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administravimo slaptažodis"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC adresų klastojimas"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Ti_nklo ryšys"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Tiesioginis (numatytasis)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Tinklų tiltas ir įgaliotasis serveris"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Nepasiekiama(-s)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Įjungta (numatytasis)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Įjungta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Išjungta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Išjungta (numatytasis)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Išjungti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "Palei_sti Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist patyrė nesėkmę su grįžties kodu {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup patyrė nesėkmę su grįžties kodu {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr "live-persist patyrė nesėkmę su grįžties kodu {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr "umount patyrė nesėkmę su grįžties kodu {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administravimo slaptažodis"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Jeigu jums reikia atlikti administravimo užduotis, nusistatykite administravimo slaptažodį. Priešingu atveju, didesnio saugumo sumetimais slaptažodis bus išjungtas."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Įveskite administravimo slaptažodį"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Patvirtinkite"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Pakartokite savo administravimo slaptažodį"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Išjungti"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows maskuotė"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Šis parametras padaro taip, kad Tails atrodytų lyg Microsoft Windows 10. Tai gali praversti viešose vietose, siekiant išvengti įtarimų."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 maskuotė"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC adresų klastojimas"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC adresų klastojimas nuslepia jūsų tinklo sąsajos (belaidės ar laidinės) serijos numerį vietiniame tinkle. Bendrai, MAC adresų klastojimas yra saugesnis, nes padeda nuslėpti jūsų geografinę vietą. Tačiau jis taip pat gali sukelti ryšio problemų arba atrodyti įtartinai."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Klastoti visus MAC adresus (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Neklastoti MAC adresus"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Jūs sukonfigūruosite Tor tinklų tiltą ir vietinį įgaliotąjį serverį vėliau, po prisijungimo prie tinklo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Sveiki atvykę į Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Norėdami būti supažindinti su Tails nustatymais, viršuje spustelėkite ant <b>Rodyti vadovą</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Atrakinti"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Kalba ir regionas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nepavyko iš naujo užrakinti ilgalaikį kaupiklį."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Numatytieji nustatymai"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Atrakinama…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Įrašyti kalbos ir regiono nustatymus"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nepavyksta su šia slaptafraze atrakinti ilgalaikio kaupiklio."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "Ka_lba"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Klaviatūros išdėstymas"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatai"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "Laiko juos_ta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Šifruotas ilgalaikis kau_piklis"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Rodyti slaptafrazę"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigūruoti ilgalaikį kaupiklį"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Įveskite savo slaptafrazę, kad atrakintumėte ilgalaikį kaupiklį"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Iš naujo užrakinti ilgalaikį kaupiklį"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Jūsų ilgalaikis kaupiklis yra atrakintas. Paleiskite Tails iš naujo, norėdami jį vėl užrakinti. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "P_apildomi nustatymai"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Įrašyti papildomus nustatymus"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Pridėti papildomą nustatymą"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Tinklo konfigūravimas"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Jeigu jūsų interneto ryšys yra cenzūruojamas, filtruojamas ar jungiamas per įgaliotąjį serverį, tuomet galite konfigūruoti Tor tinklų tiltą ar vietinį įgaliotąjį serverį. Norėdami dirbti visiškai atsijungus nuo tinklo, galite išjungti visą darbą tinkle."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Prisijungti tiesiogiai prie Tor tinklo (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigūruoti Tor tinklų tiltą ar vietinį įgaliotąjį serverį"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Išjungti visą darbą tinkle"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Numatytieji nustatymai daugelyje situacijų yra saugūs. Norėdami pridėti pasirinktinį nustatymą, žemiau spustelėkite mygtuką \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administravimo slaptažodis"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Išjungta (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC adresų klastojimas"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Įjungta (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Ti_nklo ryšys"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows maskuotė"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Įjungta"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Išjungta"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr "Nusistatykite slaptažodį ekrano atrakinimui."
msgid "Password"
msgstr "Slaptažodis"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Patvirtinkite"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Šioje Tails versijoje yra žinomos saugumo problemos:"
@@ -808,35 +627,35 @@ msgstr "Atverti Onion grandines"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} tomas"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Tik skaitymui)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} ties {container_path}"
@@ -845,14 +664,14 @@ msgstr "{partition_name} ties {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} ties {drive_name}"
@@ -861,42 +680,42 @@ msgstr "{partition_name} ties {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Neteisinga slaptafrazė arba parametrai"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Klaida atrakinant tomą"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Nepavyko atrakinti tomo {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Viena ar daugiau programų laiko tomą užimtą."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Nepavyko užrakinti tomo {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Tomo užrakinimas nepavyko"
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr "Reikalingas tapatybės nustatymas, norint pašalinti paketą iš jūsų papildomos programinės įrangos ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administravimo slaptažodis"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Jeigu jums reikia atlikti administravimo užduotis, nusistatykite administravimo slaptažodį. Priešingu atveju, didesnio saugumo sumetimais slaptažodis bus išjungtas."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Įveskite administravimo slaptažodį"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Pakartokite savo administravimo slaptažodį"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Išjungti"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC adresų klastojimas"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC adresų klastojimas nuslepia jūsų tinklo sąsajos (belaidės ar laidinės) serijos numerį vietiniame tinkle. Bendrai, MAC adresų klastojimas yra saugesnis, nes padeda nuslėpti jūsų geografinę vietą. Tačiau jis taip pat gali sukelti ryšio problemų arba atrodyti įtartinai."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Klastoti visus MAC adresus (numatytasis)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Neklastoti MAC adresus"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Tinklo konfigūravimas"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Jeigu jūsų interneto ryšys yra cenzūruojamas, filtruojamas ar jungiamas per įgaliotąjį serverį, tuomet galite konfigūruoti Tor tinklų tiltą ar vietinį įgaliotąjį serverį. Norėdami dirbti visiškai atsijungus nuo tinklo, galite išjungti visą darbą tinkle."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Prisijungti tiesiogiai prie Tor tinklo (numatytasis)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigūruoti Tor tinklų tiltą ar vietinį įgaliotąjį serverį"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Išjungti visą darbą tinkle"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Jūs sukonfigūruosite Tor tinklų tiltą ir vietinį įgaliotąjį serverį vėliau, po prisijungimo prie tinklo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Sveiki atvykę į Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Kalba ir regionas"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Numatytieji nustatymai"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Šifruotas ilgalaikis kau_piklis"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigūruoti ilgalaikį kaupiklį"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Įveskite savo slaptafrazę, kad atrakintumėte ilgalaikį kaupiklį"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Iš naujo užrakinti ilgalaikį kaupiklį"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Jūsų ilgalaikis kaupiklis yra atrakintas. Paleiskite Tails iš naujo, norėdami jį vėl užrakinti. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "P_apildomi nustatymai"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Pridėti papildomą nustatymą"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Numatytieji nustatymai daugelyje situacijų yra saugūs. Norėdami pridėti pasirinktinį nustatymą, žemiau spustelėkite mygtuką \"+\"."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Failų konteineriai"
diff --git a/lv.po b/lv.po
index 34a613098..3e513719d 100644
--- a/lv.po
+++ b/lv.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Tiešs (noklusējuma vērtība)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Tilti un starpniekserveri"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Bezsaistē"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Atslēgt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Neizdevās atkārtoti bloķēt pastāvīgo krātuvi."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Atslēdz..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Ar šo paroles frāzi nav iespējams atbloķēt šifrēto krātuvi. "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Papildu iestatījumi"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Atcelt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Pievienot"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Atpakaļ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administratora parole"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC adrešu imitēšana"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Tīkla savienojums"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Tiešs (noklusējuma vērtība)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Tilti un starpniekserveri"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Bezsaistē"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ieslēgts (noklusējuma vērtība)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ieslēgt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Izslēgt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Izslēgts (noklusējuma vērtība)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Izslēgšana"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Palaist Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "noklusējums:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist neizdevās, norādītais kods {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup neizdevās, norādītais kods {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr "dinamisks-pastāvīgums nesekmīgs ar atgriezes kodu {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr "umount neizdevās, norādītais kods {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administrēšanas parole"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Ja Jums jāveic administrēšana, izveidojiet administrēšanas paroli.\nParoli neizveidojot, lielākas drošības dēļ, administrēšanas parole tiks atspējota."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Ievadīt administrēšanas paroli"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Apstiprināt"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Apstipriniet savu administrēšanas paroli"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Atspējot"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows kamuflāža"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Šī iespēja padara Tails pēc izskata līdzīgāku Microsoft Windows 10. Tas var būt derīgi publiskās vietās, lai izvairītos no aizdomu radīšanas."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 kamuflāža"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC adreses maldinoša maiņa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC adreses maldinoša maiņa jeb spūfings slēpj vietējiem tīkliem Jūsu tīkla saskarnes (Wi-Fi vai vadu) seriālo numuru. Vispārīgā gadījumā MAC adreses maldinoša maiņa ir drošāka, jo tā palīdz slēpt Jūsu ģeogrāfiskās atrašanās vietu. Taču tā var izraisīt arī savienojamības problēmas vai izskatīties aizdomīga."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Maldinoši norādīt visas MAC adreses (noklusējuma vērtība)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Maldinoši nenorādīt MAC adreses"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Vēlāk, pēc tam, kad izveidosit savienojumu ar tīklu, Jūs konfigurēsit Tor tiltu vai vietējo starpniekserveri."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Sveicināti Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Lai uzzinātu vairāk par Tails iestatījumiem, noklikšķiniet uz <b>Iepazīstieties</b> augstāk."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Atslēgt"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Valoda un reģions"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Neizdevās atkārtoti bloķēt pastāvīgo krātuvi."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Noklusējuma iestatījumi"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Atslēdz..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Saglabāt valodas un reģiona iestatījumus"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Ar šo paroles frāzi nav iespējams atbloķēt šifrēto krātuvi. "
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Valoda"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Klaviatūras izkārtojums"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formāts"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Laika zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Šifrēta _Pastāvīgā uzglabāšana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Parādīt paroles frāzi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurēt pastāvīgo krātuvi"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Ievadiet savu paroles frāzi, lai atslēgtu pastāvīgo krātuvi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Atkārtoti bloķēt pastāvīgo krātuvi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Jūsu pastāvīgā krātuve ir atbloķēta. Restartējiet Tails, lai to atkal bloķētu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Papildu iestatījumi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Saglabāt papildu iestatījumus"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Pievienot papildu iestatījumu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Tīkla konfigurēšana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ja Jūsu interneta savienojums tiek cenzēts, filtrēts vai starpniekots, Jūs varat nokonfigurēt Tor tiltu vai vietējo starpniekserveri. Lai pilnīgi strādātu bezsaistē, Jūs varat atspējot jebkādu tīklošanu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Veidot tiešu savienojumu ar tīklu Tor (noklusējuma vērtība)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurēt Tor tiltu vai vietējo starpniekserveri"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Atspējot jebkādu tīklošanu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Vairumā gadījumu noklusējuma vērtības ir drošas. Lai pievienotu pielāgotus iestatījumus, nospiediet tālāk esošo \"+\" pogu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administratora parole"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Izslēgts (noklusējuma vērtība)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC adrešu imitēšana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Ieslēgts (noklusējuma vērtība)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Tīkla savienojums"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows kamuflāža"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ieslēgt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Izslēgt"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Parole"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Apstiprināt"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Šai Tails versijai ir apzinātas šādas drošības problēmas:"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administrēšanas parole"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Ja Jums jāveic administrēšana, izveidojiet administrēšanas paroli.\nParoli neizveidojot, lielākas drošības dēļ, administrēšanas parole tiks atspējota."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Ievadīt administrēšanas paroli"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Apstipriniet savu administrēšanas paroli"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Atspējot"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC adreses maldinoša maiņa"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC adreses maldinoša maiņa jeb spūfings slēpj vietējiem tīkliem Jūsu tīkla saskarnes (Wi-Fi vai vadu) seriālo numuru. Vispārīgā gadījumā MAC adreses maldinoša maiņa ir drošāka, jo tā palīdz slēpt Jūsu ģeogrāfiskās atrašanās vietu. Taču tā var izraisīt arī savienojamības problēmas vai izskatīties aizdomīga."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Maldinoši norādīt visas MAC adreses (noklusējuma vērtība)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Maldinoši nenorādīt MAC adreses"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Tīkla konfigurēšana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ja Jūsu interneta savienojums tiek cenzēts, filtrēts vai starpniekots, Jūs varat nokonfigurēt Tor tiltu vai vietējo starpniekserveri. Lai pilnīgi strādātu bezsaistē, Jūs varat atspējot jebkādu tīklošanu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Veidot tiešu savienojumu ar tīklu Tor (noklusējuma vērtība)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurēt Tor tiltu vai vietējo starpniekserveri"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Atspējot jebkādu tīklošanu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Vēlāk, pēc tam, kad izveidosit savienojumu ar tīklu, Jūs konfigurēsit Tor tiltu vai vietējo starpniekserveri."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Sveicināti Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Valoda un reģions"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Noklusējuma iestatījumi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Šifrēta _Pastāvīgā uzglabāšana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurēt pastāvīgo krātuvi"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Ievadiet savu paroles frāzi, lai atslēgtu pastāvīgo krātuvi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Atkārtoti bloķēt pastāvīgo krātuvi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Jūsu pastāvīgā krātuve ir atbloķēta. Restartējiet Tails, lai to atkal bloķētu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Papildu iestatījumi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Pievienot papildu iestatījumu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Vairumā gadījumu noklusējuma vērtības ir drošas. Lai pievienotu pielāgotus iestatījumus, nospiediet tālāk esošo \"+\" pogu."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/mk.po b/mk.po
index 346712c81..03d59d5cf 100644
--- a/mk.po
+++ b/mk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Директно (стандардно)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Мост и Прокси"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Офлајн/Исклучен"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Отклучи"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Не успеа презаклучувањето на постјаниот склад."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Отклучува..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Не може да се отклучи енкриптираниот скалд со оваа лозинка"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Дополнителни поставки"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Откажи се"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Додади"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Назад"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Администраторска Лозинка"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Уклучено (Стандардно)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Мрежно Поврзување"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Директно (стандардно)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Мост и Прокси"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Офлајн/Исклучен"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Уклучено (Стандардно)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Уклучено"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Исклучено"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Исклучено (Стандардно)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Исклучување"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Стартување на Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "стандарден:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "живо-постојаното не успеа со повратниот код {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup не успеа со повратен код {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr "живо-постојаното не успеа со повратен код {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr "демонтирањето не успеа со повратен код {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Административна лозинка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Поставете администраторска лозинка ако треба да извршувате администраторски задачи. Инаку, административната лозинка е оневозможена заради подобра безбедност."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Внеси администраторска лозинка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Потврди"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Потврди ја твојата администраотрска лозинка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Оневозможи"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows камуфлирање"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Оваа опција прави Tails да изгледа како Microsoft Windows 10. Ова може да биде корисно за да избегнете привлекување на сомнеж на јавни места."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 маска"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Спуфинг на MAC адреса"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Спуфингот на MAC адресата го крие серискиот број на вашиот мрежен интерфејс (Wi-Fi или жичен) од локалната мрежа. Спуфингот на MAC адресата генерално е побезбеден затоа што ви помага да ја сокриете вашата географска локација. Но исто така може да создаде проблеми со поврзувањето или истото да изгледа сомнително. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Имитирај ги сите MAC адреси (стандардно)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Не ги имитирај MAC адресите"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Ќе го конфигирирате Tor мостот и локалното прокси подоцна откако ќе се поврзете на мрежа."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Добредојдовте во Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "За да бидете водени низ поставките за Tails, кликнете на <b>Направете обиколка</b> погоре"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Отклучи"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Јазик и Регион"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Не успеа презаклучувањето на постјаниот склад."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Основни поставки"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Отклучува..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Зачувај ги поставките за Јазик и Регион"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Не може да се отклучи енкриптираниот скалд со оваа лозинка"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Јазик"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Распоред на тастатура"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Формати"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Временска зона"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Енкриптиран_Постојан склад"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Покажи лозинка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Конфигурирај го постојаниот склад"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Внеси ја твојата лозинка за да го отклучиш постојаниот склад"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Презаклучи го постојаниот склад"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Вашиот постојан скалд е отклучен. Повторно стартувајте го Tails "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Дополнителни поставки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Зачувај ги дополнителните поставки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Додади дополнителна поставка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Конфигурирање на мрежа"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ако вашето поврзување на Интернет е цензурирано, филтрирано, или е преку прокси можете да го конфигурирате Tor Мостот или локално прокси. За да работите целосно офлајн, можете да ја оневозможите целата мрежа."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Поврзи се директно на Tor мрежата (стандардно)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Конфигурирај Tor мост или локално прокси"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Иневозможување на целата мрежа"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Стандардните поставки се безбедни во повеќето ситуации. За да додадете прилагодено поставување, притиснете го \"+\" копчето подолу."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Администраторска Лозинка"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Исклучено (Стандардно)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Уклучено (Стандардно)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Уклучено (Стандардно)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Мрежно Поврзување"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Маскирање"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Уклучено"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Исклучено"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Лозинка"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Потврди"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Глас"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Административна лозинка"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Поставете администраторска лозинка ако треба да извршувате администраторски задачи. Инаку, административната лозинка е оневозможена заради подобра безбедност."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Внеси администраторска лозинка"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Потврди ја твојата администраотрска лозинка"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Оневозможи"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Спуфинг на MAC адреса"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Спуфингот на MAC адресата го крие серискиот број на вашиот мрежен интерфејс (Wi-Fi или жичен) од локалната мрежа. Спуфингот на MAC адресата генерално е побезбеден затоа што ви помага да ја сокриете вашата географска локација. Но исто така може да создаде проблеми со поврзувањето или истото да изгледа сомнително. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Имитирај ги сите MAC адреси (стандардно)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Не ги имитирај MAC адресите"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Конфигурирање на мрежа"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ако вашето поврзување на Интернет е цензурирано, филтрирано, или е преку прокси можете да го конфигурирате Tor Мостот или локално прокси. За да работите целосно офлајн, можете да ја оневозможите целата мрежа."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Поврзи се директно на Tor мрежата (стандардно)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Конфигурирај Tor мост или локално прокси"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Иневозможување на целата мрежа"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Ќе го конфигирирате Tor мостот и локалното прокси подоцна откако ќе се поврзете на мрежа."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Добредојдовте во Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Јазик и Регион"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Основни поставки"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Енкриптиран_Постојан склад"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Конфигурирај го постојаниот склад"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Внеси ја твојата лозинка за да го отклучиш постојаниот склад"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Презаклучи го постојаниот склад"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Вашиот постојан скалд е отклучен. Повторно стартувајте го Tails "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Дополнителни поставки"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Додади дополнителна поставка"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Стандардните поставки се безбедни во повеќето ситуации. За да додадете прилагодено поставување, притиснете го \"+\" копчето подолу."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ml.po b/ml.po
index 9064bf83c..25d98faef 100644
--- a/ml.po
+++ b/ml.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "ചേര്ക്കുക"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "പിന്നോട്ട്"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "ചേര്ക്കുക"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "പിന്നോട്ട്"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "ഉറപ്പാക്കു "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "പ്രവർത്തനരഹിതമാക്കു "
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "ഭാഷയും പ്രദേശവും "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "രഹസ്യവാക്കു്"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "ഉറപ്പാക്കു "
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "വോളിയം അൺലോക് ചെയ്യുന്നതിൽ തെറ്റ് സംഭവിച്ചു "
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "പ്രവർത്തനരഹിതമാക്കു "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "ഭാഷയും പ്രദേശവും "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/mr.po b/mr.po
index f9132a086..f5b1a107f 100644
--- a/mr.po
+++ b/mr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "जोडा"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "जोडा"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ms_MY.po b/ms_MY.po
index 7575f8ee0..715e43727 100644
--- a/ms_MY.po
+++ b/ms_MY.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Lancar"
msgid "_Exit"
msgstr "_Keluar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Terus (lalai)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Titi & Proksi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Luar Talian"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Buka"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Gagal mengunci semula storan berterusan."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Membuka..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Tidak dapat buka storan tersulit dengan frasa laluan ini."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Tetapan Tambahan"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Batal"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Tambah"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Kembali"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "Kata _Laluan Pentadbiran"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Perdayaan Alamat _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Sambungan _Rangkaian"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Terus (lalai)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Titi & Proksi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Luar Talian"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Hidup (lalai)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Hidup"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Mati"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Mati (lalai)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Matikan"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Mula Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist gagal dengan kod kembali {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup gagal dengan kod kembali {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr "live-persist gagal dengan kod kembali {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
"{stderr}"
msgstr "umount gagal dengan kod kembali {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Kata Laluan Pentadbiran"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Sediakan satu kata laluan pentadbiran jika anda perlu lakukan tugas-tugas pentadbir. Jika sebaliknya, kata laluan pentadbiran dilumpuhkan atas sebab keselamatan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Masukkan kata laluan pentadbiran"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Sahkan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Sahkan kata laluan pentadbiran anda"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Lumpuhkan"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Penyamaran Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Tetapan ini akan membuatkan Tails akan lebih kelihatan seperti Windows 10. Ini mungkin berguna di tempat-tempat awam untuk mengelakkan perhatian syak wasangka."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Penyamaran Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Perdayaan Alamat MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Perdayaan alamat MAC menyembunyikan nombor siri antaramuka rangkaian anda (Wi-Fi atau berwayar) kepada rangkaian setempat. Perdayaan alamat MAC biasa lebih selamat kerana ia dapat membantu anda sembunyikan lokasi geografi anda. Tetapi ia mungkin menyebabkan masalah sambungan atau akan menimbulkan syak wasangka."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Perdaya semua alamat MAC (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Jangan perdaya alamat-alamat MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Anda akan konfigur titi Tor dan proksi setempat kemudian selepas bersambung dengan rangkaian."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Selamat datang ke Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Untuk mendapatkan panduan ketika mengendali Tetapan Tails, klik pada <b>Jelajah Terpandu</b> di atas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Buka"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Bahasa & Wilayah"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Gagal mengunci semula storan berterusan."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Tetapan Lalai"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Membuka..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Simpan Tetapan Bahasa & Wilayah"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Tidak dapat buka storan tersulit dengan frasa laluan ini."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Bahasa"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "Bentangan _Papan Kekunci"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Format"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zon Waktu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Storan _Berterusan Tersulit"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Tunjuk Frasa Laluan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigur Storan Berterusan"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Masukkan frasa laluan anda untuk membuka storan berterusan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Buka Semula Storan Berterusan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Storan berterusan anda tidak berkunci. Mulakan semula Tails untuk menguncinya semula."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Tetapan _Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Simpan Tetapan Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Tambah satu tetapan tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Konfigurasi Rangkaian"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Sekiranya sambungan Internet anda ditapis atau dikenakan proksi anda boleh konfigur satu titi Tor atau proksi setempat. Untuk sepenuhnya berfungsi secara luar talian, anda boleh lumpuhkan semua perangkaian."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Sambung terus ke rangkaian Tor (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigur titi Tor atau proksi setempat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Lumpuhkan semua perangkaian"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Tetapan lalai adalah selamat dalam semua keadaan. Untuk menambah satu tetapan suai, tekan butang \"+\" di bawah."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "Kata _Laluan Pentadbiran"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Mati (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Perdayaan Alamat _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Hidup (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Sambungan _Rangkaian"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Penyamaran _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Hidup"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Mati"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -713,6 +527,11 @@ msgstr "Sediakan satu kata laluan untuk membuka skrin."
msgid "Password"
msgstr "Kata Laluan"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Sahkan"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Versi Tails ini diketahui mempunyai beberapa masalah:"
@@ -809,35 +628,35 @@ msgstr "Buka Litar Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "Volum {volume_size}"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Baca-Sahaja)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} di dalam {container_path}"
@@ -846,14 +665,14 @@ msgstr "{partition_name} di dalam {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} di dalam {drive_name}"
@@ -862,42 +681,42 @@ msgstr "{partition_name} di dalam {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frasa laluan atau parameter salah"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Ralat membuka volum"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Tidak dapat membuka volum {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1095,6 +914,130 @@ msgid ""
" ($(command_line))"
msgstr "Pengesahihan diperlukan untuk membuang satu pakej daripada perisian tambahan anda ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Kata Laluan Pentadbiran"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Sediakan satu kata laluan pentadbiran jika anda perlu lakukan tugas-tugas pentadbir. Jika sebaliknya, kata laluan pentadbiran dilumpuhkan atas sebab keselamatan."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Masukkan kata laluan pentadbiran"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Sahkan kata laluan pentadbiran anda"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Lumpuhkan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Perdayaan Alamat MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Perdayaan alamat MAC menyembunyikan nombor siri antaramuka rangkaian anda (Wi-Fi atau berwayar) kepada rangkaian setempat. Perdayaan alamat MAC biasa lebih selamat kerana ia dapat membantu anda sembunyikan lokasi geografi anda. Tetapi ia mungkin menyebabkan masalah sambungan atau akan menimbulkan syak wasangka."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Perdaya semua alamat MAC (lalai)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Jangan perdaya alamat-alamat MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurasi Rangkaian"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Sekiranya sambungan Internet anda ditapis atau dikenakan proksi anda boleh konfigur satu titi Tor atau proksi setempat. Untuk sepenuhnya berfungsi secara luar talian, anda boleh lumpuhkan semua perangkaian."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Sambung terus ke rangkaian Tor (lalai)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigur titi Tor atau proksi setempat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Lumpuhkan semua perangkaian"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Anda akan konfigur titi Tor dan proksi setempat kemudian selepas bersambung dengan rangkaian."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Selamat datang ke Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Bahasa & Wilayah"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Tetapan Lalai"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Storan _Berterusan Tersulit"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigur Storan Berterusan"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Masukkan frasa laluan anda untuk membuka storan berterusan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Buka Semula Storan Berterusan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Storan berterusan anda tidak berkunci. Mulakan semula Tails untuk menguncinya semula."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Tetapan _Tambahan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Tambah satu tetapan tambahan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Tetapan lalai adalah selamat dalam semua keadaan. Untuk menambah satu tetapan suai, tekan butang \"+\" di bawah."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Bekas Fail"
diff --git a/my.po b/my.po
index 235d17591..b01187232 100644
--- a/my.po
+++ b/my.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "ဖျက်သိမ်းရန်"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "အော့ဖ်လိုင်း"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "ထည့်သွင်းရန်"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "နောက်သို့"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "ဖျက်သိမ်းရန်"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "အော့ဖ်လိုင်း"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "ထည့်သွင်းရန်"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "နောက်သို့"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "စက်ပိတ်ရန်"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "အတည်ပြုရန်"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "စကားဝှက် "
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "အတည်ပြုရန်"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nb.po b/nb.po
index 18fc6ee71..14b74304b 100644
--- a/nb.po
+++ b/nb.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Start"
msgid "_Exit"
msgstr "_Avslutt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direkte (forvalg)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bro og mellomtjener"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Frakoblet"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Lås opp"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Klarte ikke å låse vedvarende lagring igjen."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Låser opp…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan ikke låse opp kryptert lagring med denne passordsekvensen."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Ytterligere innstillinger"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Avbryt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Legg til"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Tilbake"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administrasjonspassord"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Simulering av _MAC-adresse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Nettverkstilkobling"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkte (forvalg)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bro og mellomtjener"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "På (forvalg)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Av"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "På"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Av (forvalg)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Skru av"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Start Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "forvalg:VTH"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist mislyktes med returkode {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup mislyktes med returkode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr "live-persist mislyktes med returkode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr "umount mislyktes med returkode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administrasjonspassord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Sett opp et administrasjonspassord hvis du trenger å utføre administrative oppgaver. Ellers er administrasjonspassordet avslått for bedret sikkerhet."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Skriv inn et administrasjonspassord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bekreft"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bekreft ditt administrasjonspassord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Skru av"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-kamuflasje"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Dette valget gjør at Tails ettaper Microsoft Windows 10. Dette kan være nyttig i det offentlige rom for å unngå å tiltrekke seg mistanke."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10-kamuflasje"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Simuler MAC-adresse"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Simulering av MAC-adresser skjuler serienummeret tilhørende ditt nettverksgrensesnitt (Wi-Fi eller trådbundet) for lokalnettverket. Simulering av MAC-adresser er i hovedsak sikrere siden det hjelper deg å skjule din geografiske plassering. Men det kan også forårsake tilkoblingsproblemer eller se mistenkelig ut."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Simuler alle MAC-adresser (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ikke simuler MAC-adresser"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Du vil sette opp Tor-broen og lokal mellomtjener senere etter å ha koblet til et nettverk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkommen til Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "For å bli veiledet gjennom innstillinger i Tails, klikk <b>Åpne veiledning</b> ovenfor"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Lås opp"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Språk og region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Klarte ikke å låse vedvarende lagring igjen."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Forvalgte innstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Låser opp…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Lagre språk- og regions -innstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan ikke låse opp kryptert lagring med denne passordsekvensen."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Språk"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Tastaturoppsett"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formater"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tidssone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Kryptert _vedvarende lagring"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Vis passordsekvens"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Sett opp vedvarende lagring"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Skriv inn din passordsekvens for å låse opp det vedvarende lageret"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Lås vedvarende lagring igjen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ditt vedvarende lager er låst opp. En omstart av Tails vil låse det igjen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ytterligere innstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Lagre ytterligere innstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Legg til ytterligere innstilling"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Nettverksoppsett"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Hvis denne datamaskinens internettforbindelse er sensurert, filtrert eller går via en mellomtjener, kan du sette opp en Tor-bro, eller lokal mellomtjener. For å jobbe helt frakoblet, kan du skru av all nettverkstilknytning."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Koble direkte til Tor-nettverket (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Sett opp en Tor-bro eller lokal mellomtjener"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Skru av alle nettverk"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "De forvalgte innstillingene er trygg i de fleste fall. For å legge til en egendefinert innstilling, trykk \"+\"-knappen nedenfor."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrasjonspassord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Av (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Simulering av _MAC-adresse"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "På (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Nettverkstilkobling"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-kamuflasje"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Av"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "På"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr "Sett opp et passord for å låse opp skjermen."
msgid "Password"
msgstr "Passord"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bekreft"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Denne versjonen av Tails har kjente sikkerhetsproblem:"
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Feil ved opplåsing av volum"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administrasjonspassord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Sett opp et administrasjonspassord hvis du trenger å utføre administrative oppgaver. Ellers er administrasjonspassordet avslått for bedret sikkerhet."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Skriv inn et administrasjonspassord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bekreft ditt administrasjonspassord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Skru av"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Simuler MAC-adresse"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Simulering av MAC-adresser skjuler serienummeret tilhørende ditt nettverksgrensesnitt (Wi-Fi eller trådbundet) for lokalnettverket. Simulering av MAC-adresser er i hovedsak sikrere siden det hjelper deg å skjule din geografiske plassering. Men det kan også forårsake tilkoblingsproblemer eller se mistenkelig ut."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Simuler alle MAC-adresser (forvalg)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ikke simuler MAC-adresser"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Nettverksoppsett"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Hvis denne datamaskinens internettforbindelse er sensurert, filtrert eller går via en mellomtjener, kan du sette opp en Tor-bro, eller lokal mellomtjener. For å jobbe helt frakoblet, kan du skru av all nettverkstilknytning."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Koble direkte til Tor-nettverket (forvalg)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Sett opp en Tor-bro eller lokal mellomtjener"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Skru av alle nettverk"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Du vil sette opp Tor-broen og lokal mellomtjener senere etter å ha koblet til et nettverk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkommen til Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Språk og region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Forvalgte innstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Kryptert _vedvarende lagring"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Sett opp vedvarende lagring"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Skriv inn din passordsekvens for å låse opp det vedvarende lageret"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Lås vedvarende lagring igjen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Ditt vedvarende lager er låst opp. En omstart av Tails vil låse det igjen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Ytterligere innstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Legg til ytterligere innstilling"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "De forvalgte innstillingene er trygg i de fleste fall. For å legge til en egendefinert innstilling, trykk \"+\"-knappen nedenfor."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Filbeholdere"
diff --git a/ne.po b/ne.po
index 570db6aa5..49cadf765 100644
--- a/ne.po
+++ b/ne.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nl.po b/nl.po
index 0093e36bf..558d8f83f 100644
--- a/nl.po
+++ b/nl.po
@@ -34,9 +34,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 18:59+0000\n"
-"Last-Translator: Meteor 0id\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn(a)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 "_Afsluiten"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Rechtstreeks (standaard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Ontgrendelen"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Opnieuw vergrendelen van permanente opslag mislukt."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Ontgrendelen…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan versleutelde opslag niet ontgrendelen met deze wachtwoordzin."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Extra instellingen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Annuleren"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Toevoegen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Terug"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Beheerderswachtwoord"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC-adresspoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Netwerkverbinding"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Rechtstreeks (standaard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Aan (standaard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Aan"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Uit"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Uit (standaard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Uitschakelen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "Tails _starten"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist mislukt met retourcode {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -203,7 +205,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup mislukt met retourcode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -211,7 +213,7 @@ msgid ""
"{stderr}"
msgstr "live-persist mislukt met retourcode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -219,225 +221,37 @@ msgid ""
"{stderr}"
msgstr "unmount mislukt met retourcode {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Beheerderswachtwoord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Stel een beheerderswachtwoord in als u beheertaken moet uitvoeren. Als dat niet zo is, wordt het wachtwoord uitgeschakeld omwille van betere beveiliging."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Voer een beheerderswachtwoord in."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bevestigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bevestig uw beheerderswachtwoord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Uitschakelen"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Deze optie laat Tails meer op Microsoft Windows 10 lijken. Dit kan handig zijn om minder argwaan op te wekken op openbare locaties."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10-camouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC-adresspoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC-adresspoofing verbergt het serienummer van uw netwerkkaart (wifi of kabel) op het lokale netwerk. Het spoofen van MAC-adressen is meestal veiliger, aangezien dit uw geografische locatie helpt verbergen. Het kan echter ook verbindingsproblemen met zich meebrengen of er verdacht uitzien."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Alle MAC-adressen spoofen (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC-adressen niet spoofen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "De Tor-bridge en lokale proxy stelt u later in nadat u verbinding met een netwerk hebt gemaakt."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Welkom bij Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Klik hierboven op <b>Rondleiding starten</b> om de rondleiding door de instellingen van Tails te volgen."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Ontgrendelen"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Taal & regio"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Opnieuw vergrendelen van permanente opslag mislukt."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standaardinstellingen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Ontgrendelen…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Taal- en regio-instellingen opslaan"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan versleutelde opslag niet ontgrendelen met deze wachtwoordzin."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "Taa_l"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "Toetsen_bordindeling"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "I_ndelingen"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tijdzone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Versleutelde _permanente opslag"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Wachtwoordzin tonen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Permanente opslag configureren"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Voer uw wachtwoordzin in om de permanente opslag te ontgrendelen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Permanente opslag opnieuw vergrendelen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Uw permanente opslag is ontgrendeld. Herstart Tails om de opslag opnieuw te vergrendelen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Extr_a instellingen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Extra instellingen opslaan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Extra instelling toevoegen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Netwerkconfiguratie"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Als uw internetverbinding wordt gecensureerd, gefilterd of via een proxy verloopt, kunt u een Tor-bridge of lokale proxy configureren. Om helemaal offline te werken, kunt u alle netwerken uitschakelen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Rechtstreeks met het Tor-netwerk verbinden (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Een Tor-bridge of lokale proxy configureren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Alle netwerken uitschakelen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "De standaardinstellingen zijn veilig in de meeste situaties. Klik op de ‘+’-knop hieronder om een aangepaste instelling toe te voegen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Beheerderswachtwoord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Uit (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC-adresspoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Aan (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Netwerkverbinding"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Aan"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Uit"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -736,6 +550,11 @@ msgstr "Stel een wachtwoord in om het scherm te ontgrendelen."
msgid "Password"
msgstr "Wachtwoord"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bevestigen"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Deze versie van Tails heeft bekende beveiligings-problemen:"
@@ -832,35 +651,35 @@ msgstr "Onion-circuits openen"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Alleen-lezen)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -869,14 +688,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} op {drive_name}"
@@ -885,42 +704,42 @@ msgstr "{partition_name} op {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Onjuiste wachtwoordzin of parameters"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Fout bij ontgrendelen van volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Kon volume {volume_name}:\n{error_message} niet ontgrendelen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Een of meer toepassingen houden het volume bezet."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Kon volume {volume_name} niet vergrendelen:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Vergrendelen van het volume mislukt"
@@ -1118,6 +937,130 @@ msgid ""
" ($(command_line))"
msgstr "Er is authenticatie vereist om een pakket uit uw extra software te verwijderen ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Beheerderswachtwoord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Stel een beheerderswachtwoord in als u beheertaken moet uitvoeren. Als dat niet zo is, wordt het wachtwoord uitgeschakeld omwille van betere beveiliging."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Voer een beheerderswachtwoord in."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bevestig uw beheerderswachtwoord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Uitschakelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-adresspoofing"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC-adresspoofing verbergt het serienummer van uw netwerkkaart (wifi of kabel) op het lokale netwerk. Het spoofen van MAC-adressen is meestal veiliger, aangezien dit uw geografische locatie helpt verbergen. Het kan echter ook verbindingsproblemen met zich meebrengen of er verdacht uitzien."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Alle MAC-adressen spoofen (standaard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC-adressen niet spoofen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Netwerkconfiguratie"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Als uw internetverbinding wordt gecensureerd, gefilterd of via een proxy verloopt, kunt u een Tor-bridge of lokale proxy configureren. Om helemaal offline te werken, kunt u alle netwerken uitschakelen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Rechtstreeks met het Tor-netwerk verbinden (standaard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Een Tor-bridge of lokale proxy configureren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Alle netwerken uitschakelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "De Tor-bridge en lokale proxy stelt u later in nadat u verbinding met een netwerk hebt gemaakt."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Welkom bij Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Taal & regio"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standaardinstellingen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Versleutelde _permanente opslag"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Permanente opslag configureren"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Voer uw wachtwoordzin in om de permanente opslag te ontgrendelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Permanente opslag opnieuw vergrendelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Uw permanente opslag is ontgrendeld. Herstart Tails om de opslag opnieuw te vergrendelen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Extr_a instellingen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Extra instelling toevoegen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "De standaardinstellingen zijn veilig in de meeste situaties. Klik op de ‘+’-knop hieronder om een aangepaste instelling toe te voegen."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Bestandscontainers"
diff --git a/nl_BE.po b/nl_BE.po
index 54ca5fb92..60daa3421 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Ontgrendelen"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Bezig met ontgrendelen…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Annuleer"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Toevoegen"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Terug"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Aan"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Uit"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bevestigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Uitschakelen"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Ontgrendelen"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Bezig met ontgrendelen…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Aan"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Uit"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Wachtwoord"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bevestigen"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Deze versie van Tails heeft gekende beveiligingsproblemen:"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Uitschakelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nn.po b/nn.po
index 565971de3..7338d0231 100644
--- a/nn.po
+++ b/nn.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Start"
msgid "_Exit"
msgstr "_Avslutt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direkte (standard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fråkopla"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Fjern blokkering"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Fjernar blokkering"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Tillegsinnstillingar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Avbrjot"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Legg til"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Tilbake"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkte (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fråkopla"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "På (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "På"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Av"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Av (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Adminiistrasjonspassord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Skriv inn eit admin-passord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Stadfest"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Stadfest admin-passordet ditt"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Slå av"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkomen til Tails!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Fjern blokkering"
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Språk og region"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standard-innstillingar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Fjernar blokkering"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Vis passord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Nettverksoppsett"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Slå av alle nettverksfunksjonar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Av (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "På (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "På"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Av"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Passord"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Stadfest"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Denne versjonen av Halar hev kjende tryggleiksproblem:"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Adminiistrasjonspassord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Skriv inn eit admin-passord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Stadfest admin-passordet ditt"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Slå av"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Nettverksoppsett"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Slå av alle nettverksfunksjonar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkomen til Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Språk og region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standard-innstillingar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/oc.po b/oc.po
index 394bc0ce2..bcdf7cbca 100644
--- a/oc.po
+++ b/oc.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancel"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fòra linha"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Apondre"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Precedent"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fòra linha"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Apondre"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Precedent"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "I"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "O"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "I"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "O"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "Senhal"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/or.po b/or.po
index 2bf9bd099..8ae777cbf 100644
--- a/or.po
+++ b/or.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/pa.po b/pa.po
index 8c08ff6cf..f9ec81c34 100644
--- a/pa.po
+++ b/pa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "ਚਲਾਓ(_L)"
msgid "_Exit"
msgstr "ਬੰਦ ਕਰੋ(_E)"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "ਸ਼ਾਮਿਲ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "ਰੱਦ ਕਰੋ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "ਸ਼ਾਮਿਲ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "ਬੰਦ ਕਰੋ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/pl.po b/pl.po
index 5e37475e1..80d17dd32 100644
--- a/pl.po
+++ b/pl.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Uruchom"
msgid "_Exit"
msgstr "_Wyjście"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Połącz (domyślny)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Mostek i Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Poza zasięgiem"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Odblokuj"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nie udało się ponownie zablokować Pamięci Trwałej."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Odblokowanie ..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nie można odblokować zaszyfrowanej pamięci z tym hasłem."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Dodatkowe Ustawienia"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Anuluj"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Dodaj"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Wstecz"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Hasło Administracyjne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Spoofowanie adresów MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Połączenie Sieciowe"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Połącz (domyślny)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Mostek i Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Poza zasięgiem"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Włączony (domyślny)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Wyłączony (domyślny)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Wyłączenie"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Uruchom Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "domyślnie:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist zakończył się błędem z kodem {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup zakończył się błędem z kodem {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr "live-persist nie powiodło się z kodem powrotnym {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
"{stderr}"
msgstr "umount zakończył się błędem z kodem {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Hasło Administracyjne"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Ustaw hasło administracyjne jeśli będziesz musiał wykonywać zadania administracyjne. W innym przypadku hasło administracyjne zostanie wyłączone dla większego bezpieczeństwa."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Wprowadź hasło administracyjne"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Potwierdź"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potwierdź swoje hasło administracyjne"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Wyłącz"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Kamuflaż Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Ta opcja zamienia interfejs Tails-a na podobny do Microsoft Windows 10. Może pomóc Ci uniknąć podejrzeń i ich przyciągania w miejscach publicznych."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Kamuflaż Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Fałszowanie Adresu MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Fałszowanie adresu MAC ukrywa number seryjny Twojej karty sieciowej lub kart sieciowych (Wi-Fi lub połączenie przewodowe) przed lokalnymi sieciami. Fałszowanie adresu MAC powoduje Ciebie bezpieczniejszym i pomaga ukryć Twoje położenie geograficzne, ale może również powodować problemy z siecią lub podejrzenia."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Fałszuj wszystkie adresy MAC (domyślne)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nie fałszuj adresu MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Możesz skonfigurować ustawienia mostka i lokalne proxy po wcześniejszym połączeniu z siecią."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Witaj w Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Aby zostać przeprowadzony przez ustawienia Tails kliknij na <b>Przewodnik</b> powyżej"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Odblokuj"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Język i Lokalizacja"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nie udało się ponownie zablokować Pamięci Trwałej."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Ustawienia Domyślne"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Odblokowanie ..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Zapisz ustawienia Języka i Lokalizacji"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nie można odblokować zaszyfrowanej pamięci z tym hasłem."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Język"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Układ Klawiatury"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formaty"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Strefa Czasowa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Zaszyfrowany _Pamięć Trwała"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Pokaż Hasło"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Skonfiguruj Pamięć Trwałą"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Wpisz Twoje hasło do odblokowania przechowania danych"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Ponownie zablokuj Pamięć Trwałą"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Twoja pamięć trwała jest odblokowana. Zrestartuj Tails aby zablokować ją ponownie."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Dodatkowe Ustawienia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Zapisz Dodatkowe Ustawienia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Dodaj dodatkowe ustawienie"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Konfiguracja Sieci"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Jeśli połączenie internetowe tego komputera jest ocenzurowane, filtrowane lub przepuszczane przez proxy.Możesz skonfigurować most lub ustawienia proxy. Do całkowitej pracy offline, możesz wyłączyć wszystkie sieci."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Połącz bezpośrednio do Sieci Tor (domyślne)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Skonfiguruj mostek Tor lub lokalny serwer proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Wyłącz wszystkie połączenia sieciowe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Ustawienia domyślne są bezpieczne w większości sytuacji. Aby dodać własne ustawienie , kliknij \"+\" poniżej."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Hasło Administracyjne"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Wyłączony (domyślny)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Spoofowanie adresów MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Włączony (domyślny)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Połączenie Sieciowe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Kamuflarz Okien"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -726,6 +540,11 @@ msgstr "Ustaw hasło aby odblokować ekran."
msgid "Password"
msgstr "Hasło"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Potwierdź"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Ta wersja Tails ma błędy bezpieczeństwa:"
@@ -822,35 +641,35 @@ msgstr "Otwarte Obwody Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Wielkość"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Tylko do odczytu)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} w {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} w {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} na {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} na {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Nieprawidłowe hasło lub parametry"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Błąd odblokowywania woluminu"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Nie można odblokować woluminu {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Nie można zablokować woluminu {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1108,6 +927,130 @@ msgid ""
" ($(command_line))"
msgstr "Aby usunąć paczkę z twojego dodatkiwego oprogramowania ($(command_line)) wymagana jest autentykacja"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Hasło Administracyjne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Ustaw hasło administracyjne jeśli będziesz musiał wykonywać zadania administracyjne. W innym przypadku hasło administracyjne zostanie wyłączone dla większego bezpieczeństwa."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Wprowadź hasło administracyjne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potwierdź swoje hasło administracyjne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Wyłącz"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Fałszowanie Adresu MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Fałszowanie adresu MAC ukrywa number seryjny Twojej karty sieciowej lub kart sieciowych (Wi-Fi lub połączenie przewodowe) przed lokalnymi sieciami. Fałszowanie adresu MAC powoduje Ciebie bezpieczniejszym i pomaga ukryć Twoje położenie geograficzne, ale może również powodować problemy z siecią lub podejrzenia."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Fałszuj wszystkie adresy MAC (domyślne)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nie fałszuj adresu MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfiguracja Sieci"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Jeśli połączenie internetowe tego komputera jest ocenzurowane, filtrowane lub przepuszczane przez proxy.Możesz skonfigurować most lub ustawienia proxy. Do całkowitej pracy offline, możesz wyłączyć wszystkie sieci."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Połącz bezpośrednio do Sieci Tor (domyślne)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Skonfiguruj mostek Tor lub lokalny serwer proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Wyłącz wszystkie połączenia sieciowe"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Możesz skonfigurować ustawienia mostka i lokalne proxy po wcześniejszym połączeniu z siecią."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Witaj w Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Język i Lokalizacja"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Ustawienia Domyślne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Zaszyfrowany _Pamięć Trwała"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Skonfiguruj Pamięć Trwałą"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Wpisz Twoje hasło do odblokowania przechowania danych"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Ponownie zablokuj Pamięć Trwałą"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Twoja pamięć trwała jest odblokowana. Zrestartuj Tails aby zablokować ją ponownie."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Dodatkowe Ustawienia"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Dodaj dodatkowe ustawienie"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Ustawienia domyślne są bezpieczne w większości sytuacji. Aby dodać własne ustawienie , kliknij \"+\" poniżej."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Kontenery plików"
diff --git a/pt_BR.po b/pt_BR.po
index fc2d32a4f..2646a1bf2 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -32,8 +32,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Direta (padrão)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Ponte & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Falha ao rebloquear o volume de armazenamento persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Não foi possível abrir o dispositivo de armazenamento criptografado com esta frase secreta"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Configurações Adicionais"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancelar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Adicionar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Anterior"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Senha de Administração"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Mascaragem de endereços MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Conexão de Rede"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direta (padrão)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Ponte & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ativar (padrão)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ativar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desativar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Desativar (padrão)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Encerrar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Iniciar Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist não conseguiu retornar o código {returncode]:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup não conseguiu retornar o código {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -209,7 +211,7 @@ msgid ""
"{stderr}"
msgstr "live-persist não pôde retornar o código {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -217,225 +219,37 @@ msgid ""
"{stderr}"
msgstr "umount não pôde retornar o código {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Senha de Administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Crie uma senha de administração caso você precise realizar tarefas administrativas.\nCaso contrário, para garantir uma maior segurança, essa função será desabilitada ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Inserir uma senha de administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmar a sua senha de administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desabilitar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflagem Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opção faz com que o Tails fique parecido com o Microsoft Windows 10, o que pode ser útil para evitar suspeitas em lugares públicos. "
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflagem Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "_Mascaragem de endereços MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "A Mascaragem de endereços MAC ocultará da rede local o número de série da sua interface de rede (Wi-Fi ou cabo). Mascarar endereços MAC é em geral mais seguro, porque permite ocultar a sua localização geográfica. Porém, essa opção pode gerar problemas de conexão ou parecer suspeita."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Mascarar todos os endereços MAC (padrão)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Não mascarar endereços MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Você irá configurar uma ponte Tor e um proxy local após conectar-se a uma rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Boas-vindas ao Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Se você desejar um guia das configurações do Tails, clique em <b>Guia</b>, acima"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma & Região"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Falha ao rebloquear o volume de armazenamento persistente."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configurações-Padrão"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloqueando..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Salvar Configurações de Idioma & Região"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Não foi possível abrir o dispositivo de armazenamento criptografado com esta frase secreta"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Idioma"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Modelo de Teclado"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatos"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona Horária"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Criptografado_ Armazenamento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase secreta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar o Dispositivo de Armazenamento Persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Inserir a sua frase secreta para abrir o dispositivo de armazenamento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Rebloquear o Dispositivo de Armazenamento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "O seu volume de armazenamento persistente está aberto. Reiniciar Tails para bloqueá-lo novamente."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Configurações Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Salvar Configurações Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Adicionar uma configuração adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuração de Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Se a sua conexão de Internet estiver censurada, filtrada ou sob proxy, você pode configurar uma ponte Tor ou um proxy local. Para trabalhar totalmente offline, é preciso desabilitar toda conexão de rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectar-se diretamente à rede Tor (padrão)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar uma ponte Tor ou um proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desativar toda conexão de rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "As configurações padrão são seguras na maioria dos casos. Para outras configurações personalizadas, clique na tecla \"+\" abaixo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Senha de Administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Desativar (padrão)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Mascaragem de endereços MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Ativar (padrão)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Conexão de Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflagem Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ativar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desativar"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -734,6 +548,11 @@ msgstr "Configure uma senha para desbloquear a tela"
msgid "Password"
msgstr "Senha"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versão do Tails tem problemas de segurança conhecidos:"
@@ -830,35 +649,35 @@ msgstr "Abrir Circuitos Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} em {container_path}"
@@ -867,14 +686,14 @@ msgstr "{partition_name} em {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} em {drive_name}"
@@ -883,42 +702,42 @@ msgstr "{partition_name} em {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Senha ou parâmetros incorretos"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Erro ao desbloquear o volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Não foi possível desbloquear o volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Um ou mais aplicativos estão mantendo o volume ocupado."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Não foi possível bloquear {volume_name}:{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Bloquear o volume falhou"
@@ -1116,6 +935,130 @@ msgid ""
" ($(command_line))"
msgstr "Autenticação é necessária para remover um pacote de seus softwares adicionais ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Senha de Administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Crie uma senha de administração caso você precise realizar tarefas administrativas.\nCaso contrário, para garantir uma maior segurança, essa função será desabilitada ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Inserir uma senha de administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmar a sua senha de administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desabilitar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "_Mascaragem de endereços MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "A Mascaragem de endereços MAC ocultará da rede local o número de série da sua interface de rede (Wi-Fi ou cabo). Mascarar endereços MAC é em geral mais seguro, porque permite ocultar a sua localização geográfica. Porém, essa opção pode gerar problemas de conexão ou parecer suspeita."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Mascarar todos os endereços MAC (padrão)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Não mascarar endereços MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuração de Rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Se a sua conexão de Internet estiver censurada, filtrada ou sob proxy, você pode configurar uma ponte Tor ou um proxy local. Para trabalhar totalmente offline, é preciso desabilitar toda conexão de rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectar-se diretamente à rede Tor (padrão)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar uma ponte Tor ou um proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desativar toda conexão de rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Você irá configurar uma ponte Tor e um proxy local após conectar-se a uma rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Boas-vindas ao Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma & Região"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configurações-Padrão"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Criptografado_ Armazenamento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar o Dispositivo de Armazenamento Persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Inserir a sua frase secreta para abrir o dispositivo de armazenamento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Rebloquear o Dispositivo de Armazenamento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "O seu volume de armazenamento persistente está aberto. Reiniciar Tails para bloqueá-lo novamente."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Configurações Adicionais"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Adicionar uma configuração adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "As configurações padrão são seguras na maioria dos casos. Para outras configurações personalizadas, clique na tecla \"+\" abaixo."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Volumes para Armazenagem de Arquivos"
diff --git a/pt_PT.po b/pt_PT.po
index 6a8188783..644a8f099 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Direto (predefinição)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Ponte e Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Desligado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Não foi possível voltar a bloquear o armazenamento permanente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "A desbloquear…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Não é possível desbloquear o armazenamento encriptado com esta frase-senha"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Configurações Adicionais"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancelar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Adicionar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Voltar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "Palavra-passe de _Administração"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Mascarar Endereço _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Ligação de _Rede"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direto (predefinição)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Ponte e Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Desligado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ativado (predefinição)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ativado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desativado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Desativado (predefinição)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Encerrar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Iniciar o Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "predefinição: LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist falhou com o código de retorno {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup com o código de retorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr "live-persist com o código de retorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
"{stderr}"
msgstr "umount com o código de retorno {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Palavra-passe de Administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Crie uma palavra-passe de administrador se precisar de executar tarefas administrativas. Caso contrário, a palavra-passe de administrador é desativada para uma melhor segurança."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Insira uma palavra-passe de administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirme a sua palavra-passe de administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desativar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflagem do Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opção faz com que Tails seja parecido com o Microsoft Windows 10. Isto pode ser útil para evitar atrair suspeitas em locais públicos."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflagem do Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Mascarar Endereço MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "O mascarar de endereços MAC oculta o número de série da sua interface de rede (com ou sem fios) para a rede local. Mascarar endereços MAC é geralmente seguro porque ajuda-o a ocultar a sua localização geográfica. Mas esta pode também criar problemas de ligação ou parecer suspeita."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Mascarar todos endereços MAC (predefinição)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Não mascarar endereços MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Irá configurar a ponte do Tor e o proxy local mais tarde após ligar-se a uma rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bem-vindo ao Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Para ser guiado através das configurações do Tails, clique em cima em <b>Ver Guia</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma e Região"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Não foi possível voltar a bloquear o armazenamento permanente."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configurações Predefinidas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "A desbloquear…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Guardar Configurações do Idioma e Região"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Não é possível desbloquear o armazenamento encriptado com esta frase-senha"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Idioma"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "Disposição do _Teclado"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatos"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Fuso Horário"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Armazenamento _Permanente Encriptado"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase-Senha"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar Armazenamento Permanente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Insira a sua frase-senha para desbloquear o armazenamento permanente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Voltar a bloquear o Armazenamento Permanente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "O seu armazenamento permanente encontra-se desbloqueado. Reinicie o Tails para bloqueá-lo novamente."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Configurações _Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Guardar Configurações Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Adicionar uma configuração adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuração de Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Se a ligação à Internet está censurada, filtrada ou com proxy, pode configurar uma ponte Tor ou um proxy local. Para funcionar completamente desligado, pode desativar toda a rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Ligar diretamente à rede Tor (predefinição)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar uma ponte Tor ou definições de proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desativar toda a rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "As configurações predefinidas são seguras na maioria das situações. Para adicionar uma definição personalizada, pressione no botão abaixo \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "Palavra-passe de _Administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Desativado (predefinição)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Mascarar Endereço _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Ativado (predefinição)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Ligação de _Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camuflagem do _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ativado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desativado"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -714,6 +528,11 @@ msgstr "Configure uma palavra-passe para desbloquear o ecrã."
msgid "Password"
msgstr "Palavra-passe"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versão do Tails tem alguns problemas de segurança conhecidos:"
@@ -810,35 +629,35 @@ msgstr "Abrir Circuitos Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (apenas leitura)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} em {container_path}"
@@ -847,14 +666,14 @@ msgstr "{partition_name} em {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} em {drive_name}"
@@ -863,42 +682,42 @@ msgstr "{partition_name} em {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frase-senha ou parâmetros incorretos"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Erro ao desbloquear o volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Não foi possível desbloquear o volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Uma ou mais aplicações está a manter o dispositivo ocupado."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Não foi possível bloquear o disco {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Bloquear este dispositivo falhou."
@@ -1096,6 +915,130 @@ msgid ""
" ($(command_line))"
msgstr "É necessária a autenticação para remover um pacote dos seus programas adicionais ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Palavra-passe de Administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Crie uma palavra-passe de administrador se precisar de executar tarefas administrativas. Caso contrário, a palavra-passe de administrador é desativada para uma melhor segurança."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Insira uma palavra-passe de administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirme a sua palavra-passe de administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desativar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Mascarar Endereço MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "O mascarar de endereços MAC oculta o número de série da sua interface de rede (com ou sem fios) para a rede local. Mascarar endereços MAC é geralmente seguro porque ajuda-o a ocultar a sua localização geográfica. Mas esta pode também criar problemas de ligação ou parecer suspeita."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Mascarar todos endereços MAC (predefinição)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Não mascarar endereços MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuração de Rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Se a ligação à Internet está censurada, filtrada ou com proxy, pode configurar uma ponte Tor ou um proxy local. Para funcionar completamente desligado, pode desativar toda a rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Ligar diretamente à rede Tor (predefinição)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar uma ponte Tor ou definições de proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desativar toda a rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Irá configurar a ponte do Tor e o proxy local mais tarde após ligar-se a uma rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bem-vindo ao Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma e Região"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configurações Predefinidas"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Armazenamento _Permanente Encriptado"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar Armazenamento Permanente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Insira a sua frase-senha para desbloquear o armazenamento permanente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Voltar a bloquear o Armazenamento Permanente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "O seu armazenamento permanente encontra-se desbloqueado. Reinicie o Tails para bloqueá-lo novamente."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Configurações _Adicionais"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Adicionar uma configuração adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "As configurações predefinidas são seguras na maioria das situações. Para adicionar uma definição personalizada, pressione no botão abaixo \"+\"."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Volumes de Ficheiros"
diff --git a/ro.po b/ro.po
index f345b42cc..98c13b1fb 100644
--- a/ro.po
+++ b/ro.po
@@ -25,8 +25,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Direct (implicit)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Punte și Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Deconectat"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Deblocaţi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Reblocarea mediului de stocare persistent a eșuat. "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Se deblochează..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Deblocare imposibilă a dispozitivului de stocare criptat cu această parolă."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Setări adiționale"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Anulare"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Adaugă"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Înapoi"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Parolă administrare"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Falsificare adresă MAC "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Conexiune rețea"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direct (implicit)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Punte și Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Deconectat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activat (implicit)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Dezactivat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Dezactivat (implicit)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Inchide"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Pornește Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "implicit:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist a eșuat returnând eroarea {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup a eșuat returnând eroarea {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -202,7 +204,7 @@ msgid ""
"{stderr}"
msgstr "live-persist a eșuat returnând eroarea {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -210,225 +212,37 @@ msgid ""
"{stderr}"
msgstr "umount a eșuat returnând eroarea {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Parolă administrare"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Setaţi o parolă de administrare pentru operațiuni administrative. Altfel, parola de administrare va fi dezactivată pentru securitate sporită."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduceţi o parolă de administrare"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmă"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confimaţi parola de administrare"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Dezactivaţi"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflare Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Această opțiune face ca Tails să semene mai mult cu Microsoft Windows 10. Acest lucru poate fi util în locuri publice pentru a evita suspiciunile."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflare Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Falsificare adresă MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "\"Spoofing\"-ul adresei MAC ascunde numărul serial al interfeței de rețea (Wi-Fi sau prin cablu) către rețeaua locală. Acest lucru este în general mai sigur deoarece ajută la ascunderea geolocației. Totuși este posibil să creeze probleme de conectivitate sau să ridice suspiciuni. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsifică toate adresele MAC (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nu falsifica adresele MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Veți configura puntea Tor și proxy-ul local ulterior după conectarea la rețea. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bun venit la Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Pentru a lansa ghidul setărilor Tails' , apasaţi butonul <b>Fă turul </b> de deasupra"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Deblocaţi"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Limbă și Regiune"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Reblocarea mediului de stocare persistent a eșuat. "
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Setări implicite"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Se deblochează..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Salvaţi setările de Limbă și Regiune"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Deblocare imposibilă a dispozitivului de stocare criptat cu această parolă."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Limba"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Configurare tastatură"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formaturi"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Fus orar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Mediu Stocare Persistentă Criptat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Arată parola"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configuraţi stocarea persistentă"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Introduceţi parola pentru deblocarea stocării persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Blocaţi din nou Stocarea Persistentă"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Mediul de stocare persistent este deblocat. Reporniţi Tails pentru a-l bloca din nou."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Setări Adiționale"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Salvaţi Setările Adiționale"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Adaugaţi o setare adițională"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configurare rețea"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Dacă conexiunea de Internet este cenzurată, filtrată, sau trecută printr-un proxy, puteți configura o punte Tor sau un proxy local. Pentru a lucra complet în mod deconectat, puteți dezactiva rețeaua."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectare directă la rețeaua Tor (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configuraţi o punte Tor sau un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Dezactivați toate rețelele"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Setările implicite sunt sigure în majoritatea cazurilor. Pentru a adăuga o setare personalizată, apasaţi pe butonul \"+\" de mai jos."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Parolă administrare"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Dezactivat (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Falsificare adresă MAC "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Activat (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Conexiune rețea"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflaj Windows "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activat"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Dezactivat"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -727,6 +541,11 @@ msgstr "Setați o parolă pentru a debloca ecranul."
msgid "Password"
msgstr "Parola"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmă"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Această versiune Tails are probleme de securitate cunoscute:"
@@ -823,35 +642,35 @@ msgstr "Circuite Onion Deschise"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volum"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} în {container_path}"
@@ -860,14 +679,14 @@ msgstr "{partition_name} în {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} pe {drive_name}"
@@ -876,42 +695,42 @@ msgstr "{partition_name} pe {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frază de access sau parametri greșiti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Eroare la deblocarea volumului"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Nu s-a putut debloca volumul {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Nu s-a putut bloca volumul {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1109,6 +928,130 @@ msgid ""
" ($(command_line))"
msgstr "Aveți nevoie de autentificare pentru a elimina un pachet din aplicațiile adiționale ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Parolă administrare"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Setaţi o parolă de administrare pentru operațiuni administrative. Altfel, parola de administrare va fi dezactivată pentru securitate sporită."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduceţi o parolă de administrare"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confimaţi parola de administrare"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Dezactivaţi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Falsificare adresă MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "\"Spoofing\"-ul adresei MAC ascunde numărul serial al interfeței de rețea (Wi-Fi sau prin cablu) către rețeaua locală. Acest lucru este în general mai sigur deoarece ajută la ascunderea geolocației. Totuși este posibil să creeze probleme de conectivitate sau să ridice suspiciuni. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsifică toate adresele MAC (implicit)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nu falsifica adresele MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configurare rețea"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Dacă conexiunea de Internet este cenzurată, filtrată, sau trecută printr-un proxy, puteți configura o punte Tor sau un proxy local. Pentru a lucra complet în mod deconectat, puteți dezactiva rețeaua."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectare directă la rețeaua Tor (implicit)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configuraţi o punte Tor sau un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Dezactivați toate rețelele"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Veți configura puntea Tor și proxy-ul local ulterior după conectarea la rețea. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bun venit la Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Limbă și Regiune"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Setări implicite"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Mediu Stocare Persistentă Criptat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configuraţi stocarea persistentă"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Introduceţi parola pentru deblocarea stocării persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Blocaţi din nou Stocarea Persistentă"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Mediul de stocare persistent este deblocat. Reporniţi Tails pentru a-l bloca din nou."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Setări Adiționale"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Adaugaţi o setare adițională"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Setările implicite sunt sigure în majoritatea cazurilor. Pentru a adăuga o setare personalizată, apasaţi pe butonul \"+\" de mai jos."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Containere de Fișiere"
diff --git a/ru.po b/ru.po
index 2d6b74c6f..d556f9e3e 100644
--- a/ru.po
+++ b/ru.po
@@ -37,8 +37,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Прямой (по умолчанию)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Мост и прокси"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Отключён"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Разблокировать"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Не удалось заблокировать постоянное хранилище."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Разблокировка..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Не удается открыть зашифрованное хранилище с этой ключевой фразой."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Дополнительные настройки"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Отмена"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Добавить"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Назад"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Пароль Администратора"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Подмена MAC-адреса"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Интернет соединение "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Прямой (по умолчанию)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Мост и прокси"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Отключён"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Включить (по умолчанию)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Включить"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Выключить"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Выключить (по умолчанию)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Закрытие"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Запуск Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "по умолчанию:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist не сработал, код ошибки {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -206,7 +208,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup не сработал код ошибки {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -214,7 +216,7 @@ msgid ""
"{stderr}"
msgstr "не удалось выполнить сохранение с кодом возврата {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -222,225 +224,37 @@ msgid ""
"{stderr}"
msgstr "umount не сработал код ошибки {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Пароль администратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Введите пароль администратора для выполнения задач администрирования. В противном случае возможности администрирования будут отключены в целях безопасности."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Введите пароль администратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Подтвердить"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Подтвердите ваш пароль администратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Отключить"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Маскировка под Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Благодаря этой опции, Tails выглядит похожим на Microsoft Windows 10. Это поможет избежать привлечения внимания при использовании в публичных местах."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 камуфляж"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Подмена MAC-адреса"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Подмена MAC-адреса скрывает серийный номер вашей сетевой карты (Wi-Fi или проводной) от локальной сети. Подмена MAC-адреса повышает общую безопасность, поскольку это поможет вам скрыть ваше географическое местоположение. Следует иметь в виду, что это может выглядеть подозрительным и при этом возможны проблемы с подключением."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Подмена всех MAC-адресов (по умолчанию)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Не подменять MAC-адреса"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Вы сможете настроить мост Tor и локальный прокси после подключения к сети."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Добро пожаловать в Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Чтобы познакомиться с настройками Tails, нажмите на <b>Take a Tour</b> выше"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Разблокировать"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Язык и регион"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Не удалось заблокировать постоянное хранилище."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Настройки по умолчанию"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Разблокировка..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Сохранить язык и региональные настройки"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Не удается открыть зашифрованное хранилище с этой ключевой фразой."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Язык"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Раскладка клавиатуры"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Форматы"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Часовой пояс"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Зашифрованное _Постоянное Хранилище"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Показать ключевую фразу:"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Настроить постоянное хранилище"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Введите вашу ключевую фразу для разблокировки постоянного хранилища"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Заблокировать постоянное хранилище"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ваше постоянное хранилище разблокировано. Перезапустите Tails, чтобы снова заблокировать."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Дополнительные настройки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Сохранить дополнительные настройки"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Добавить дополнительный параметр"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Настройка сети"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Если ваше интернет-соединение подвергается цензуре, фильтрации или проксированию можно настроить мост Tor или локальный прокси-сервер. Для того, чтобы работать полностью в автономном режиме, вы можете отключить все сети."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Прямое подключение к сети Tor (по умолчанию)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Настройка моста Tor или локального прокси"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Отключить все сетевые подключения"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Настройки по умолчанию являются безопасными в большинстве ситуаций. Для добавления пользовательской настройки, нажмите кнопку \"+\" ниже."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Пароль Администратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Выключить (по умолчанию)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Подмена MAC-адреса"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Включить (по умолчанию)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Интернет соединение "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Маскировка под Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Включить"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Выключить"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -739,6 +553,11 @@ msgstr "Настройте пароль для разблокировки экр
msgid "Password"
msgstr "Пароль"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Подтвердить"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Эта версия Tails имеет известные проблемы безопасности:"
@@ -835,35 +654,35 @@ msgstr "Открытые схемы луковицы"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Том"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Только для чтения)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -872,14 +691,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -888,42 +707,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Неверная фраза или параметры"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Ошибка разблокировки тома"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Не удалось разблокировать том {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Одно или несколько приложений используют том."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Невозможно заблокировать том {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Ошибка блокировки тома"
@@ -1121,6 +940,130 @@ msgid ""
" ($(command_line))"
msgstr "Для удаления пакета из вашего дополнительного ПО требуется аутентификация ($ (command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Пароль администратора"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Введите пароль администратора для выполнения задач администрирования. В противном случае возможности администрирования будут отключены в целях безопасности."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Введите пароль администратора"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Подтвердите ваш пароль администратора"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Отключить"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Подмена MAC-адреса"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Подмена MAC-адреса скрывает серийный номер вашей сетевой карты (Wi-Fi или проводной) от локальной сети. Подмена MAC-адреса повышает общую безопасность, поскольку это поможет вам скрыть ваше географическое местоположение. Следует иметь в виду, что это может выглядеть подозрительным и при этом возможны проблемы с подключением."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Подмена всех MAC-адресов (по умолчанию)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Не подменять MAC-адреса"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Настройка сети"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Если ваше интернет-соединение подвергается цензуре, фильтрации или проксированию можно настроить мост Tor или локальный прокси-сервер. Для того, чтобы работать полностью в автономном режиме, вы можете отключить все сети."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Прямое подключение к сети Tor (по умолчанию)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Настройка моста Tor или локального прокси"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Отключить все сетевые подключения"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Вы сможете настроить мост Tor и локальный прокси после подключения к сети."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Добро пожаловать в Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Язык и регион"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Настройки по умолчанию"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Зашифрованное _Постоянное Хранилище"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Настроить постоянное хранилище"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Введите вашу ключевую фразу для разблокировки постоянного хранилища"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Заблокировать постоянное хранилище"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Ваше постоянное хранилище разблокировано. Перезапустите Tails, чтобы снова заблокировать."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Дополнительные настройки"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Добавить дополнительный параметр"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Настройки по умолчанию являются безопасными в большинстве ситуаций. Для добавления пользовательской настройки, нажмите кнопку \"+\" ниже."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Контейнеры файлов"
diff --git a/si_LK.po b/si_LK.po
index 8852ca3f8..e24f0a66a 100644
--- a/si_LK.po
+++ b/si_LK.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "අවලංගු කරන්න"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "නොබැදි"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "එකතු කරන්න"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "පසුපසට"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "අවලංගු කරන්න"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "නොබැදි"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "එකතු කරන්න"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "පසුපසට"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "වසන්න"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows ව්යාජ ආවරණයක් යෙදවීම "
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "මුරපදය"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sk.po b/sk.po
index 6562e5047..4537947b4 100644
--- a/sk.po
+++ b/sk.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Spustiť"
msgid "_Exit"
msgstr "_Ukončiť"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Priame (Predvolené)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Premostenie a Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Odomknúť"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Chyba pri znovuzamknutí trvalého úložiska."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Odomykám..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nedá sa odomknúť šifrované úložisko pomocou daného hesla."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Dodatočné nastavenia"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Zrušiť"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Pridať"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Späť"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Heslo administrátora"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Spoofovanie - predstieranie MAC adresy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Sieťové pripojenie"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Priame (Predvolené)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Premostenie a Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Zapnuté (predvolené)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Zapnúť"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Vypnúť"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Vypnuté (predvolené)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Vypnutie"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Zapnúť Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stderr} "
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -192,7 +194,7 @@ msgid ""
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -200,225 +202,37 @@ msgid ""
"{stderr}"
msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Heslo správcu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "V prípade potreby vykonávať úlohy správcu, nastavte heslo správcu. V opačnom prípade bude zakázané kvôli vyššej bezpečnosti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Zadajte heslo správcu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Potvrdiť"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potvrďte heslo správcu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Zakázať"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Kamufláž"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Táto voľba upraví podobnosť Tails bližšie k Microsoft Windows 10. Toto môže byť užitočné na verejnych miestach v záujme vyhnúť sa podozreniu."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 kamufláž"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Predstieranie MAC adresy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Spoofovanie - predstieranie MAC adries skryje sériové čísla vašich sieťových kariet (Wi-Fi aj káblových) pre lokálne siete. Toto napomôže k schovaniu vašej geografickej polohy. Avšak môže spôsobiť problémy s konektivitou alebo vyzerať podozrivo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoofnuť - predstierať všetky MAC adresy (predvolené)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nespoofnuť - nepredstierať všetky MAC adresy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Nastavím Tor premostenie a miestne proxy neskôr, po pripojení do siete."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Vitajte v Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Ak chcete sprievodcu nastavením Tails, kliknite <b>Otvor Sprievodcu</b> hore"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Odomknúť"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Jazyk a Región"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Chyba pri znovuzamknutí trvalého úložiska."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Predvolené nastavenia"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Odomykám..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Uložiť nastavenie Jazyku a Regiónu"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nedá sa odomknúť šifrované úložisko pomocou daného hesla."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Jazyk"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Rozloženie Klavesnice"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Regionálny formát"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Časové pásmo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Šifrované _Trvalé úložisko"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Ukáž heslo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Nakonfigurovať Trvalé úložisko"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Zvoľte prístupové heslo na odomknutie trvalého oddielu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Znova uzamknúť Trvalé úložisko"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Vaše Trvalé úložisko je odomknuté. Reštartujte Tails pre zamknutie."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Dodatočné nastavenia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Uložiť dodatočné nastavenia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Pridať dodatočné nastavenie"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Nastavenia siete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ak je pripojenie tohto počítača k Internetu je cenzurované, filtrované alebo sprostredkovávané, môžete nakonfigurovať Tor premostenie alebo miestne proxy. Na prácu offline, môžete úplne vypnúť sieť."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Pripojiť priamo do siete Tor. (predvolené)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurovať Tor premostenie alebo miestne proxy."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deaktivovať všetky siete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Predvolené nastavenia sú bezpečné vo väčšine prípadov. Ak chcete upraviť nastavenia stlačte \"+\" tlačidlo dolu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Heslo administrátora"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Vypnuté (predvolené)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Spoofovanie - predstieranie MAC adresy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Zapnuté (predvolené)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Sieťové pripojenie"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Maskovanie ako Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Zapnúť"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Vypnúť"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -717,6 +531,11 @@ msgstr "Nastaviť heslo na odomknutie obrazovky."
msgid "Password"
msgstr "Heslo"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Potvrdiť"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Táto verzia Tails má známe bezpečnostné problémy:"
@@ -813,35 +632,35 @@ msgstr "Otvoriť Onion Okruhy"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -850,14 +669,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -866,42 +685,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Nesprávne heslo alebo parametre"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Chyba pri odomknutí oblasti"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Nepodarilo sa odomknúť oblasť {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Jedna, alebo niekoľko aplikácií stále využivajú zväzok"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Uzamknutie zväzku {volume_name} nebolo možné :\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Zamykanie zväzku zlyhalo"
@@ -1099,6 +918,130 @@ msgid ""
" ($(command_line))"
msgstr "Vyžadovaná autentifikácia pre ostránenie balíšku z Vášho doplnkového softvéru ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Heslo správcu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "V prípade potreby vykonávať úlohy správcu, nastavte heslo správcu. V opačnom prípade bude zakázané kvôli vyššej bezpečnosti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Zadajte heslo správcu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potvrďte heslo správcu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Zakázať"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Predstieranie MAC adresy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Spoofovanie - predstieranie MAC adries skryje sériové čísla vašich sieťových kariet (Wi-Fi aj káblových) pre lokálne siete. Toto napomôže k schovaniu vašej geografickej polohy. Avšak môže spôsobiť problémy s konektivitou alebo vyzerať podozrivo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoofnuť - predstierať všetky MAC adresy (predvolené)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nespoofnuť - nepredstierať všetky MAC adresy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Nastavenia siete"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ak je pripojenie tohto počítača k Internetu je cenzurované, filtrované alebo sprostredkovávané, môžete nakonfigurovať Tor premostenie alebo miestne proxy. Na prácu offline, môžete úplne vypnúť sieť."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Pripojiť priamo do siete Tor. (predvolené)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurovať Tor premostenie alebo miestne proxy."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deaktivovať všetky siete"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Nastavím Tor premostenie a miestne proxy neskôr, po pripojení do siete."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Vitajte v Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Jazyk a Región"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Predvolené nastavenia"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Šifrované _Trvalé úložisko"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Nakonfigurovať Trvalé úložisko"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Zvoľte prístupové heslo na odomknutie trvalého oddielu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Znova uzamknúť Trvalé úložisko"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Vaše Trvalé úložisko je odomknuté. Reštartujte Tails pre zamknutie."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Dodatočné nastavenia"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Pridať dodatočné nastavenie"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Predvolené nastavenia sú bezpečné vo väčšine prípadov. Ak chcete upraviť nastavenia stlačte \"+\" tlačidlo dolu."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Súborové kontajnery"
diff --git a/sl.po b/sl.po
index e093b0839..c6d28a9c0 100644
--- a/sl.po
+++ b/sl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Zagon"
msgid "_Exit"
msgstr "_Izhod"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Dodaj"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Nazaj"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Odklepanje..."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Prekliči"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Vklop"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Dodaj"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Izklop"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Nazaj"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Izklop"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Potrdi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Odklepanje..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Show Passphrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Vklop"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Izklop"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "Geslo"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Potrdi"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Ta verzija Sledi ima znane varnostne izhode:"
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/son.po b/son.po
index 9c998a393..130a2ea73 100644
--- a/son.po
+++ b/son.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sq.po b/sq.po
index fa7a69aa1..bedd47f2f 100644
--- a/sq.po
+++ b/sq.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Lëshoni"
msgid "_Exit"
msgstr "_Dilni"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "I shkëputur"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Zhblloko"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Cilësime Shtesë"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Anuloni"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Shtoni"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Mbrapa"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "I shkëputur"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Mbylleni"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Fjalëkalimi i Administrimit"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Ripohoje"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Çaktivizoje"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Zhblloko"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Mirësevini në Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Gjuha & Zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Rregullimet e parazgjedhura"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Shfaq Frazëkalimin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Ruaj Cilësimet Shtesë"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfiguro urën e Tor ose proxy lokal"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Ç'aktivizoni të gjitha rrjetet"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Fjalëkalim"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Ripohoje"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Ky version i Tails ka probleme sigurie të njohura:"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Fjalëkalimi i Administrimit"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Çaktivizoje"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfiguro urën e Tor ose proxy lokal"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Ç'aktivizoni të gjitha rrjetet"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Mirësevini në Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Gjuha & Zona"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Rregullimet e parazgjedhura"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sr.po b/sr.po
index b49770908..8df3cc779 100644
--- a/sr.po
+++ b/sr.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Pokreni"
msgid "_Exit"
msgstr "_Излаз"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direktno (podrazumevano)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Most i proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Офлајн"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Откључај"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Откључавам…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nije moguće otključati šifrovano skladište sa ovom lozinkom."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Dodatna podešavanja"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Otkaži"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Додај"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Назад"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administratorksa Lozinka"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direktno (podrazumevano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Most i proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Офлајн"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Uključeno (podrazumevano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Uključeno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Isključeno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Isključeno (podrazumevano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Гашење"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Pokreni Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administratorska lozinka"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Postavi administratorsku lozinku ukoliko je potrebno izvršiti administratorske zadatke. U suprotnom, administratorska lozinka će biti onemogućena radi veće bezbednosti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Unesi administratorsku lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potvrdi administratorsku lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Искључи"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows kamuflaža"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Ova opcija će učiniti da Tails izgleda kao Microsoft Windows 10. Ovo može biti korisno da se izbegne sumnjičavost na javnim mestima."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 kamuflaža"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Откључај"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Konfigurisaćeš Tor most i lokalni proxy kasnije prilikom povezivanja na mrežu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Dobrodošli u Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Za vođenje kroz Tails podešavanja klikni na <b>Započni obilazak</b> koji se nalazi iznad"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Jezik i region"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Podrazumevana podešavanja"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Откључавам…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Sačuvaj podešavanja jezika i regiona"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nije moguće otključati šifrovano skladište sa ovom lozinkom."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Jezik"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Raspored Tastature"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formati"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Прикажи лозинку"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Dodatna Podešavanja"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Sačuvaj Dodatna podešavanja"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Dodaj Dodatna podešavanja"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Konfigurisanje mreže"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Poveži se direktno na Tor mrežu (podrazumevano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfiguriši Tor most ili lokalni proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Onemogući svako umrežavanje"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Podrazumevana podešavanja su najčešće sigurna. Za dodavanje prilagođenih podešavanja pritisni \"+\" dugme koje se nalazi ispod."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administratorksa Lozinka"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Isključeno (podrazumevano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Uključeno (podrazumevano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Kamuflaža"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Uključeno"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Isključeno"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -713,6 +527,11 @@ msgstr "Postavi lozinku za otključavanje ekrana."
msgid "Password"
msgstr "Lozinka"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Potvrdi"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Ova verzija Tails-a ima poznate sledeće bezbednosne probleme:"
@@ -809,35 +628,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Prostorni medij"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} u {container_path}"
@@ -846,14 +665,14 @@ msgstr "{partition_name} u {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} na {drive_name}"
@@ -862,42 +681,42 @@ msgstr "{partition_name} na {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Pogrešna lozinka ili parametri"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Greška pri otključavanju prostornog medija"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Ne može se otključati prostorni medij {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Ne može se zaključati prostorni medij {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1095,6 +914,130 @@ msgid ""
" ($(command_line))"
msgstr "Potrebna je autentifikacija da bi uklonili paket iz Vašeg dodatnog softvera ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administratorska lozinka"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Postavi administratorsku lozinku ukoliko je potrebno izvršiti administratorske zadatke. U suprotnom, administratorska lozinka će biti onemogućena radi veće bezbednosti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Unesi administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potvrdi administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Искључи"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurisanje mreže"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Poveži se direktno na Tor mrežu (podrazumevano)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfiguriši Tor most ili lokalni proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Onemogući svako umrežavanje"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Konfigurisaćeš Tor most i lokalni proxy kasnije prilikom povezivanja na mrežu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Dobrodošli u Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Jezik i region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Podrazumevana podešavanja"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Dodatna Podešavanja"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Dodaj Dodatna podešavanja"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Podrazumevana podešavanja su najčešće sigurna. Za dodavanje prilagođenih podešavanja pritisni \"+\" dugme koje se nalazi ispod."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Spremišta datoteka"
diff --git a/sv.po b/sv.po
index d6309e051..a965b76d9 100644
--- a/sv.po
+++ b/sv.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Direkt (standard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bro & proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Nedkopplad"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Lås upp"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Misslyckades att låsa bestående lagring."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Låser upp..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan inte låsa upp krypterad lagring med detta lösenord."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Ytterligare inställningar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Avbryt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Lägg till"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Tillbaka"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administrationslösenord"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Fejka MAC-adress"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Nätverksanslutning"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkt (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bro & proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Nedkopplad"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "På (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "På"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Av"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Av (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Stäng av"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Starta Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "standard:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist misslyckades med felkod {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup misslyckades med felkod {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr "live-persist misslyckades med felkod {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
"{stderr}"
msgstr "umount misslyckades med felkod {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administrationslösenord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Ange ett administratörslösenord ifall du behöver utföra administrativa uppgifter.\nI annat fall kommer administratörslösenord inaktiveras för bättre säkerhet."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Ange ett administrationslösenord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bekräfta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bekräfta ditt administrationslösenord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Inaktivera"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows-kamouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Det här alternativet gör att Tails ser ut som Microsoft Windows 10. Detta kan vara användbart för att undvika att väcka misstanke på offentliga platser."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10-kamouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Fejka MAC-adress"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Genom att fejka MAC-adresser döljer du serienummer på nätverkskortet (Wi-Fi eller kabel) för lokala nätverk. Det kan hjälpa dig dölja din geografiska position. Men det kan också orsaka anslutningsproblem eller verka misstänksamt."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Fejka alla MAC-adresser (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Fejka inte alla MAC-adresser"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Du konfigurerar Tor-bryggan och lokala proxyn senare efter anslutning till ett nätverk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Välkommen till Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "För att guidas genom Tails inställningar, klicka på <b>Ta en tur</b> ovan"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Lås upp"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Språk & region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Misslyckades att låsa bestående lagring."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standardinställningar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Låser upp..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Spara språk- och regionsinställningar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan inte låsa upp krypterad lagring med detta lösenord."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Språk"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Tangentbordslayout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Format"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tidszon"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Krypterad _bestående lagring"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Visa lösenfras"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurera bestående lagring"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Mata in din lösenfras för att låsa upp den bestående lagringen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Lås bestående lagring igen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Din bestående lagring är upplåst. Starta om Tails för att låsa den igen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ytterligare inställningar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Spara ytterligare inställningar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Lägg till ytterligare inställning"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Nätverkskonfiguration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Om din Internet-anslutning censureras, filtreras eller går via proxy kan du konfigurera en Tor-brygga eller en lokal proxy. För att arbeta helt nedkopplad kan du inaktivera alla nätverk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Anslut direkt till Tor-nätverket (standard)."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurera en Tor-bro eller lokal proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Inaktivera alla nätverk"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Standardinställningarna är säkra i de flesta situationerna. För att lägga till en anpassad inställning, tryck på \"+\"-knappen nedan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrationslösenord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Av (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Fejka MAC-adress"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "På (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Nätverksanslutning"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-kamouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "På"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Av"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -726,6 +540,11 @@ msgstr "Ställ in ett lösenord för att låsa upp skärmen."
msgid "Password"
msgstr "Lösenord"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bekräfta"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Det finns kända säkerhetsproblem i den här Tails versionen:"
@@ -822,35 +641,35 @@ msgstr "Öppna Onion-kretsar"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volym"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Skrivskyddad)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} i {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} i {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} på {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} på {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Fel lösenfras eller parametrar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Ett fel uppstod vid upplåsning av volymen"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Kunde inte låsa upp volymen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "En eller flera program håller volymen upptagen."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Kunde inte låsa volymen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Låsning av volymen misslyckades"
@@ -1108,6 +927,130 @@ msgid ""
" ($(command_line))"
msgstr "Autentisering krävs för att ta bort ett paket från dina extra program ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administrationslösenord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Ange ett administratörslösenord ifall du behöver utföra administrativa uppgifter.\nI annat fall kommer administratörslösenord inaktiveras för bättre säkerhet."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Ange ett administrationslösenord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bekräfta ditt administrationslösenord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Inaktivera"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Fejka MAC-adress"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Genom att fejka MAC-adresser döljer du serienummer på nätverkskortet (Wi-Fi eller kabel) för lokala nätverk. Det kan hjälpa dig dölja din geografiska position. Men det kan också orsaka anslutningsproblem eller verka misstänksamt."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Fejka alla MAC-adresser (standard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Fejka inte alla MAC-adresser"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Nätverkskonfiguration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Om din Internet-anslutning censureras, filtreras eller går via proxy kan du konfigurera en Tor-brygga eller en lokal proxy. För att arbeta helt nedkopplad kan du inaktivera alla nätverk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Anslut direkt till Tor-nätverket (standard)."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurera en Tor-bro eller lokal proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Inaktivera alla nätverk"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Du konfigurerar Tor-bryggan och lokala proxyn senare efter anslutning till ett nätverk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Välkommen till Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Språk & region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standardinställningar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Krypterad _bestående lagring"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurera bestående lagring"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Mata in din lösenfras för att låsa upp den bestående lagringen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Lås bestående lagring igen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Din bestående lagring är upplåst. Starta om Tails för att låsa den igen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Ytterligare inställningar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Lägg till ytterligare inställning"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Standardinställningarna är säkra i de flesta situationerna. För att lägga till en anpassad inställning, tryck på \"+\"-knappen nedan."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Filbehållare"
diff --git a/sw.po b/sw.po
index 9c619aa45..933741ed5 100644
--- a/sw.po
+++ b/sw.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "futa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ongeza"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "nje ya mkondo"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "nje ya mkondo"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "futa"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Ongeza"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "Nywila\nnenosiri"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ta.po b/ta.po
index 01aa54a57..a144830f6 100644
--- a/ta.po
+++ b/ta.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "சேர்"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "மீண்டும்"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "ரத்துசெய்"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "துவங்கு"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "சேர்"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "நிறுத்து"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "மீண்டும்"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "உறுதிப்படுத்தவும்"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "முடக்கு"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "விண்டோஸ் உருமறைப்பு"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "அனைத்து நெட்வொர்க்கிங்கை முடக்கு"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "துவங்கு"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "நிறுத்து"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "கடவுச்சொல்"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "உறுதிப்படுத்தவும்"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "முடக்கு"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "அனைத்து நெட்வொர்க்கிங்கை முடக்கு"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/tails.pot b/tails.pot
index 72bfc2a9c..9b1597a55 100644
--- a/tails.pot
+++ b/tails.pot
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Direct (default)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Unlock"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Failed to relock persistent storage."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Unlocking…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Cannot unlock encrypted storage with this passphrase."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Additional Settings"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancel"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Add"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Back"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direct (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "On (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Off (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Start Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Administration Password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Set up an administration password if you need to perform administrative tasks. Otherwise, the administration password is disabled for better security."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Enter an administration password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirm"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirm your administration password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Disable"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Camouflage"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "This option makes Tails look like Microsoft Windows 10. This can be useful to avoid attracting suspicion in public places."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 camouflage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC Address Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC address spoofing hides the serial number of your network interface (Wi-Fi or wired) to the local network. Spoofing MAC addresses is generally safer as it helps you hide your geographical location. But it might also create connectivity problems or look suspicious."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof all MAC addresses (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Don't spoof MAC addresses"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "You will configure the Tor bridge and local proxy later on after connecting to a network."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Welcome to Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Unlock"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Unlocking…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cannot unlock encrypted storage with this passphrase."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Language"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Keyboard Layout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Encrypted _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Show Passphrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configure Persistent Storage"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Enter your passphrase to unlock the persistent storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Relock Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Save Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Add an additional setting"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Network Configuration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "If your Internet connection is censored, filtered, or proxied you can configure a Tor bridge or a local proxy. To work completely offline, you can disable all networking."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connect directly to the Tor network (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configure a Tor bridge or local proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Disable all networking"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Off (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "On (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr "Set up a password to unlock the screen."
msgid "Password"
msgstr "Password"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirm"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "This version of Tails has known security issues:"
@@ -805,35 +624,35 @@ msgstr "Open Onion Circuits"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -842,14 +661,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} on {drive_name}"
@@ -858,42 +677,42 @@ msgstr "{partition_name} on {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Wrong passphrase or parameters"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Error unlocking volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Couldn't unlock volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "One or more applications are keeping the volume busy."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Couldn't lock volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Locking the volume failed"
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr "Authentication is required to remove a package from your additional software ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Administration Password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Set up an administration password if you need to perform administrative tasks. Otherwise, the administration password is disabled for better security."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Enter an administration password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirm your administration password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Disable"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Address Spoofing"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC address spoofing hides the serial number of your network interface (Wi-Fi or wired) to the local network. Spoofing MAC addresses is generally safer as it helps you hide your geographical location. But it might also create connectivity problems or look suspicious."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof all MAC addresses (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Don't spoof MAC addresses"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "If your Internet connection is censored, filtered, or proxied you can configure a Tor bridge or a local proxy. To work completely offline, you can disable all networking."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connect directly to the Tor network (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configure a Tor bridge or local proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Disable all networking"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "You will configure the Tor bridge and local proxy later on after connecting to a network."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Welcome to Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Language & Region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Default Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configure Persistent Storage"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Enter your passphrase to unlock the persistent storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Relock Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "File Containers"
diff --git a/te.po b/te.po
index 219f7f3ba..82b98c8b0 100644
--- a/te.po
+++ b/te.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "జోడించండి"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "జోడించండి"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/th.po b/th.po
index 9010b2be8..7342f41e9 100644
--- a/th.po
+++ b/th.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "ออฟไลน์"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "ปลดล็อค"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "กำลังปลดล็อค..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "ตั้งค่าเพิ่มเติม"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "ยกเลิก"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "เพิ่ม"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "ย้อนกลับ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "ออฟไลน์"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "เปิด (โดยปริยาย)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "เปิด"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "ปิด"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "ปิด (โดยปริยาย)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Shutdown"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "รหัสผ่านเพื่อการดูแลระบบ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "ยืนยัน"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "ระงับการใช้งาน"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "พรางตัวเป็นวินโดวส์"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "ยินดีต้อนรับสู่ Tails!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "ปลดล็อค"
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "ภาษาและภูมิภาค"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "กำลังปลดล็อค..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "ตั้งค่าเครือข่าย"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "เชื่อมต่อโดยตรงไปยังเครือข่ายทอร์ (โดยปริยาย)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "ปิด (โดยปริยาย)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "เปิด (โดยปริยาย)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "เปิด"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "ปิด"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -714,6 +528,11 @@ msgstr ""
msgid "Password"
msgstr "รหัสผ่าน"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "ยืนยัน"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "รุ่นของ Tails เป็นที่รู้จักในประเด็นด้านความปลอดภัย:"
@@ -810,35 +629,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1096,6 +915,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "รหัสผ่านเพื่อการดูแลระบบ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "ระงับการใช้งาน"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "ตั้งค่าเครือข่าย"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "เชื่อมต่อโดยตรงไปยังเครือข่ายทอร์ (โดยปริยาย)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "ยินดีต้อนรับสู่ Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "ภาษาและภูมิภาค"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/tr.po b/tr.po
index 8389444d5..1f39550f3 100644
--- a/tr.po
+++ b/tr.po
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 a4c04de63..4abe3a17c 100644
--- a/uk.po
+++ b/uk.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "Безпосередньо (за промовчанням)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Міст і проксі"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Поза мережею"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Розблокувати"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Не вдалося заблокувати постійне сховище"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Розблокування..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Неможливо розблокувати зашифроване сховище цим паролем."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Додаткові налаштування"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Відмова"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Додати"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Назад"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Пароль адміністратора"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Підміна MAC-адреси"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_З'єднання з мережею"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Безпосередньо (за промовчанням)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Міст і проксі"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Поза мережею"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Увімкнуто (за промовчанням)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Увімк."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Вимк."
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Вимкнуто (за промовчанням)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Вимкнення"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Запустити Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "за промовчанням:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "невдача в live-persist, код поверення {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr "невдача в cryptsetup, код повернення {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -195,7 +197,7 @@ msgid ""
"{stderr}"
msgstr "невдача в live-persist, код поверення {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -203,225 +205,37 @@ msgid ""
"{stderr}"
msgstr "невдача в umount, код повернення {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Пароль адміністратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Встановіть пароль адміністатора, щоб виконувати адміністрування. Інакше він буде вимкнений для покращення безпеки."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Введіть пароль адміністратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Підтвердити"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Підтвердіть свій пароль адміністратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Вимкнути"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Маскування під Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Ця опція надає Tails вигляду Microsoft Windows 10. Можна скористатися, щоб не викликати підозри в людних місцях."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Маскування під Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Підміна MAC-адреси"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Підміна MAC-адреси приховує серійний номер вашого мережного інтерфейсу (провідного чи безпровідного) з локальною мережею. Підміна MAC-адреси в загальному безпечніша, бо допомагає вам приховати ваше географічне розташування. Але може створити проблеми зі зв'язком або виглядати підозріло."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Підмінювати всі MAC-адреси (за промовчанням)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Не підмінювати MAC-адреси"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Ви налаштуєте міст Tor і локальний проксі після приєднання до мережі."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Ласкаво просимо до Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Для проходження налаштувань Tails натисніть вище <b>Take a Tour</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Розблокувати"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Мова і розташування"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Не вдалося заблокувати постійне сховище"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Налаштування за промовчанням"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Розблокування..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Зберегти зміни мови і розташування"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Неможливо розблокувати зашифроване сховище цим паролем."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Мова"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Розкладка клавіатури"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Формати"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Часовий пояс"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Зашифроване _Постійне сховище"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Показати пароль"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Налаштувати Постійне сховище"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Введіть свій пароль, щоб розблокувати постійне сховище"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Заблокувати Постійне сховище"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ваше постійне сховище розблоковане. Перезапустіть Tails, щоб заблокувати його знов."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Додаткові налаштування"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Зберегти Додаткові налаштування"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Додати ще одне додаткове налаштування"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Налаштування мережі"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Якщо ваше з'єднання з Інтернет проходить цензуру, фільтр або проксі, ви можете налаштувати міст Tor або локальний проксі. Щоб працювати цілком офлайн, можна вимкнути всі з'єднання."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "З'єднатися з мережею Tor безпосередньо (за промовчанням)."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Налаштувати міст Tor або локальний проксі-сервер"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Вимкнути всі з'єдання"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Налаштування за промовчанням безпечні в більшості випадків. Щоб додати ваше власне налаштування, натисніть знизу \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Пароль адміністратора"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Вимкнуто (за промовчанням)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Підміна MAC-адреси"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Увімкнуто (за промовчанням)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_З'єднання з мережею"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Маскування під Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Увімк."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Вимк."
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -720,6 +534,11 @@ msgstr "Встановіть пароль, щоб розблокувати ек
msgid "Password"
msgstr "Пароль "
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Підтвердити"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Ця версія Tails має відомі проблеми безпеки:"
@@ -816,35 +635,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -853,14 +672,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -869,42 +688,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1102,6 +921,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Пароль адміністратора"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Встановіть пароль адміністатора, щоб виконувати адміністрування. Інакше він буде вимкнений для покращення безпеки."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Введіть пароль адміністратора"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Підтвердіть свій пароль адміністратора"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Вимкнути"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Підміна MAC-адреси"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Підміна MAC-адреси приховує серійний номер вашого мережного інтерфейсу (провідного чи безпровідного) з локальною мережею. Підміна MAC-адреси в загальному безпечніша, бо допомагає вам приховати ваше географічне розташування. Але може створити проблеми зі зв'язком або виглядати підозріло."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Підмінювати всі MAC-адреси (за промовчанням)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Не підмінювати MAC-адреси"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Налаштування мережі"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Якщо ваше з'єднання з Інтернет проходить цензуру, фільтр або проксі, ви можете налаштувати міст Tor або локальний проксі. Щоб працювати цілком офлайн, можна вимкнути всі з'єднання."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "З'єднатися з мережею Tor безпосередньо (за промовчанням)."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Налаштувати міст Tor або локальний проксі-сервер"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Вимкнути всі з'єдання"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Ви налаштуєте міст Tor і локальний проксі після приєднання до мережі."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Ласкаво просимо до Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Мова і розташування"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Налаштування за промовчанням"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Зашифроване _Постійне сховище"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Налаштувати Постійне сховище"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Введіть свій пароль, щоб розблокувати постійне сховище"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Заблокувати Постійне сховище"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Ваше постійне сховище розблоковане. Перезапустіть Tails, щоб заблокувати його знов."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Додаткові налаштування"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Додати ще одне додаткове налаштування"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Налаштування за промовчанням безпечні в більшості випадків. Щоб додати ваше власне налаштування, натисніть знизу \"+\"."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ur.po b/ur.po
index eca3db05a..66fdf3d91 100644
--- a/ur.po
+++ b/ur.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancel"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "آف لائن"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "شامل کریں"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "پیچھے"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "آف لائن"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "شامل کریں"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "پیچھے"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "بندھ کریں"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "تصدیق کی توسیع"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr "پاس ورڈ"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "تصدیق کی توسیع"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/uz.po b/uz.po
index b43cc6e0d..462b1de93 100644
--- a/uz.po
+++ b/uz.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "Bekor qilish"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Qo‘shish"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Bekor qilish"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Qo‘shish"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Tasdiqlash"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr "Parol"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Tasdiqlash"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/vi.po b/vi.po
index bd5cbc137..3f5738f04 100644
--- a/vi.po
+++ b/vi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "__Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Trực tiếp (mặc định)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Cầu nối & Ủy quyền"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Ngoại tuyến"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Mở khóa"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Thất bại khi khóa dung lượng bền vững lại."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Đang mở khóa..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Không thể mở khóa vùng lưu trữ bị mã hóa với mật khẩu này."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Những cài đặt thêm"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Hủy bỏ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Thêm vào"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Lùi"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Trực tiếp (mặc định)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Cầu nối & Ủy quyền"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Ngoại tuyến"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Mở (mặc định)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Bật"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "tắt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Tắt (mặc định)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Tắt trình duyệt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Start Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "mặc định:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persit thất bại với mã trả về {returncode}:\n {stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr "cài đặt mã hóa thất bại với mã trả về {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr "Tính trực tiếp-bền vững đã hỏng với mã trả về {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr "gỡ ra thất bại với mã trả về {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Mật khẩu Quản trị"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Thiết lập một mật khẩu quản trị nếu bạn cần thực hiện các tác vụ quản trị. Nếu không, mật khẩu quản trị được vô hiệu để an toàn hơn."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Nhập một mật khẩu quản trị"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Xác nhận"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Xác nhận mật khẩu quản trị của bạn"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Vô hiệu"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Ngụy trang Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Tùy chọn này làm Talls trông giống như Microsoft Windows 10. Việc này hữu ích khi tránh việc thu hút những nghi ngờ ở nơi công cộng."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Sự ngụy trang Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Sự làm giả địa chỉ MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Việc làm giả địa chỉ MAC ản chuỗi số của giao diện mạng lưới của bạn (Wi-fi hoặc có dây) đối với mạng lưới nội bộ. Việc làm giả địa chỉ MAC thường an toàn ơn vì nó giúp bạn ẩn vị trí địa lý của mình. Nhưng nó có thể tạo ra những vấn đề về kết nối hoặc trông đáng nghi ngờ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Làm giả tất cả địa chỉ MAC (mặc định)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Không làm giả địa chỉ MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Bạn sẽ cấu hình cầu nối Tor và ủy quyền nội bộ sau khi kết nối tới một mạng lưới."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Chào mừng đến với Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Để được hướng dẫn về những cài đặt của Tails, bấm chuột vào <b>Take a Tour</b> ở trên"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Mở khóa"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Ngôn ngữ và Vùng"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Thất bại khi khóa dung lượng bền vững lại."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Những cài đặt mặc định"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Đang mở khóa..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Lưu những cài đặt về ngôn ngữ và vùng"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Không thể mở khóa vùng lưu trữ bị mã hóa với mật khẩu này."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Language"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Keyboard Layout"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Encrypted _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Hiển thị đoạn mật khẩu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Cấu hình dung lượng bền vững"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Nhập mật khẩu của bạn để mở khóa dung lượng bền vững"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Khóa dung lượng bền vững lại"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Phân vùng lưu trữ bền vững của bạn bị mở khoá. Khởi động lại Tails để khoá nó lại."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Lưu những cài đặt thêm"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Thêm một cài đặt nữa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Cấu hình mạng lưới"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Nếu kết nối Internet của bạn bị kiểm duyệt, lọc bỏ, hoặc bị ủy quyền bạn có thể cấu hình một cầu nối Tor hoặc ủy quyền nội bộ. Để làm việc hoàn toàn ngoại tuyến, bạn có thể vô hiệu mọi mạng lưới."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Kết nối trực tiếp tới mạng lưới Tor (mặc định)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Cấu hình một cầu nối Tor hay một đại diện (proxy) địa phương"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Vô hiệu tất cả mạng lưới"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Những cài đặt mặc định là an toàn trong hầu hết tình huống. Để thêm những cài đặt riêng, bấm nút \"+\" bên dưới."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Tắt (mặc định)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Mở (mặc định)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Bật"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "tắt"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr "Mật khẩu"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Xác nhận"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Phiên bản này của Tails có một vài vấn đề an ninh đã được biết đến:"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Mật khẩu Quản trị"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Thiết lập một mật khẩu quản trị nếu bạn cần thực hiện các tác vụ quản trị. Nếu không, mật khẩu quản trị được vô hiệu để an toàn hơn."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Nhập một mật khẩu quản trị"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Xác nhận mật khẩu quản trị của bạn"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Vô hiệu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Sự làm giả địa chỉ MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Việc làm giả địa chỉ MAC ản chuỗi số của giao diện mạng lưới của bạn (Wi-fi hoặc có dây) đối với mạng lưới nội bộ. Việc làm giả địa chỉ MAC thường an toàn ơn vì nó giúp bạn ẩn vị trí địa lý của mình. Nhưng nó có thể tạo ra những vấn đề về kết nối hoặc trông đáng nghi ngờ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Làm giả tất cả địa chỉ MAC (mặc định)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Không làm giả địa chỉ MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Cấu hình mạng lưới"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Nếu kết nối Internet của bạn bị kiểm duyệt, lọc bỏ, hoặc bị ủy quyền bạn có thể cấu hình một cầu nối Tor hoặc ủy quyền nội bộ. Để làm việc hoàn toàn ngoại tuyến, bạn có thể vô hiệu mọi mạng lưới."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Kết nối trực tiếp tới mạng lưới Tor (mặc định)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Cấu hình một cầu nối Tor hay một đại diện (proxy) địa phương"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Vô hiệu tất cả mạng lưới"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Bạn sẽ cấu hình cầu nối Tor và ủy quyền nội bộ sau khi kết nối tới một mạng lưới."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Chào mừng đến với Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Ngôn ngữ và Vùng"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Những cài đặt mặc định"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Cấu hình dung lượng bền vững"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Nhập mật khẩu của bạn để mở khóa dung lượng bền vững"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Khóa dung lượng bền vững lại"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Phân vùng lưu trữ bền vững của bạn bị mở khoá. Khởi động lại Tails để khoá nó lại."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Thêm một cài đặt nữa"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Những cài đặt mặc định là an toàn trong hầu hết tình huống. Để thêm những cài đặt riêng, bấm nút \"+\" bên dưới."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/zh_CN.po b/zh_CN.po
index 17b07fbff..810b964c4 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -31,8 +31,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 a97303f21..7651f2bbd 100644
--- a/zh_HK.po
+++ b/zh_HK.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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 "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "取消"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "離線"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "加入"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "返回"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "取消"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "離線"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "加入"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "返回"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "打開"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "關閉"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "離開"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "窗口迷彩"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "停用全部網絡"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "打開"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "關閉"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -714,6 +528,11 @@ msgstr ""
msgid "Password"
msgstr "密碼"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "此Tails版本有已知嘅安全問題："
@@ -810,35 +629,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1096,6 +915,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "停用全部網絡"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/zh_TW.po b/zh_TW.po
index 106884d5a..4e74cf96b 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn(a)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)"
-msgstr "直接(預設)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "橋接器與代理伺服器"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "離線"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "解鎖"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "永久性儲存裝置重新鎖定失敗。"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "解鎖中...."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "此通關密語無法解鎖加密的儲存裝置。"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "額外的設定"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "取消"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "新增"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "返回"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "系統管理員密碼"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "網路卡實體位址偽裝"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "網路連線"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "直接(預設)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "橋接器與代理伺服器"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "離線"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "啟用(預設)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "啟動"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "關閉"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "關閉(預設)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "關閉"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "啟動 Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "預設：LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "ive-persist 失敗並傳回錯誤代碼：\n{returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr "加密設定失敗，錯誤代碼： {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr "live-persist 失敗並回傳以下代碼 {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr "卸載失敗，錯誤代碼： {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "管理員密碼"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "除非說您想要執行非管理員權限不可的工作，才需要設定管理員密碼，否則請關閉管理員密碼的功能以策安全。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "請輸入管理員密碼"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "確認"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "確認您的管理員密碼"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "關閉"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "視窗系統偽裝"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "這選項功能可以讓 Tails 系統的外觀看起來類似微軟 Windows 10 作業系統。這可以讓您在公共場所使用時較不引人注意。"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "微軟 Windows 10 偽裝模式"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "網路卡實體位址偽裝"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "網路卡實體位址偽裝功能可以讓您在區域網路中，隱藏您網路卡(不論是有線的或無線的)中的序號，啟動此功能可以進一步隱藏您的實際地理位置，所以總體來說會比較安全，但是啟用此功能也有可能會造成網路連線異常，或者看起來更可疑。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "偽裝所有的網路卡實體位址(預設)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "不要偽裝網路卡實體位址"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "當您連接上網路之後，將會需要設定洋蔥路由橋接器與本地端代理伺服器。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "歡迎使用 Tails！"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "若要針對 Tails 的設定進行導覽，請點選<b>功能導覽</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "解鎖"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "語言和區域"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "永久性儲存裝置重新鎖定失敗。"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "預設值"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "解鎖中...."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "儲存語言與區域的設定值"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "此通關密語無法解鎖加密的儲存裝置。"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "語言"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "鍵盤佈局"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "格式"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "時區"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "加密的永久性儲存裝置"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "顯示通關密語"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "設定永久性儲存裝置"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "請輸入通關密語以便解鎖此永久性儲存裝置"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "重新鎖定永久性儲存裝置"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "您的永久性儲存裝置已被解鎖，請重新啟動 Tails 系統以便將它再次鎖定。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "額外的設定"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "儲存額外的設定"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "添加一個額外設定"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "網路設定"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "若您所使用的網路服務遭到監控或審查的話，可以設定使用洋蔥路由橋接器來連上網路。若想要離線作業的話，可以將所有網路連線功能關閉。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "直接連上洋蔥路由網路(預設)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "為本地端的代理伺服器設定一個洋蔥路由橋接器"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "停用所有網路"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "在大多數的情況下，預設的設定值是很安全的。若您想要增加個人化的設定，請按下方的「+」按鈕。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "系統管理員密碼"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "關閉(預設)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "網路卡實體位址偽裝"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "啟用(預設)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "網路連線"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "微軟 Windows 系統偽裝"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "啟動"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "關閉"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr "設定解鎖螢幕的密碼。"
msgid "Password"
msgstr "密碼"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "確認"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "此 Tails 版本有已知的安全性問題:"
@@ -818,35 +637,35 @@ msgstr "開啟洋蔥迴路"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} 加密區"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name}（唯讀）"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} 在 {container_path}"
@@ -855,14 +674,14 @@ msgstr "{partition_name} 在 {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} 在 {drive_name}"
@@ -871,42 +690,42 @@ msgstr "{partition_name} 在 {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "密碼或參數錯誤"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "解鎖加密區時發生錯誤"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "無法解鎖加密區 {volume_name}：\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "應用程式耗佔磁區資源"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "無法鎖定加密區 {volume_name}：\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "無法鎖定此加密磁區"
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr "需要驗證來從其他軟體中移除套件 ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "管理員密碼"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "除非說您想要執行非管理員權限不可的工作，才需要設定管理員密碼，否則請關閉管理員密碼的功能以策安全。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "請輸入管理員密碼"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "確認您的管理員密碼"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "關閉"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "網路卡實體位址偽裝"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "網路卡實體位址偽裝功能可以讓您在區域網路中，隱藏您網路卡(不論是有線的或無線的)中的序號，啟動此功能可以進一步隱藏您的實際地理位置，所以總體來說會比較安全，但是啟用此功能也有可能會造成網路連線異常，或者看起來更可疑。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "偽裝所有的網路卡實體位址(預設)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "不要偽裝網路卡實體位址"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "網路設定"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "若您所使用的網路服務遭到監控或審查的話，可以設定使用洋蔥路由橋接器來連上網路。若想要離線作業的話，可以將所有網路連線功能關閉。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "直接連上洋蔥路由網路(預設)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "為本地端的代理伺服器設定一個洋蔥路由橋接器"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "停用所有網路"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "當您連接上網路之後，將會需要設定洋蔥路由橋接器與本地端代理伺服器。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "歡迎使用 Tails！"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "語言和區域"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "預設值"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "加密的永久性儲存裝置"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "設定永久性儲存裝置"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "請輸入通關密語以便解鎖此永久性儲存裝置"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "重新鎖定永久性儲存裝置"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "您的永久性儲存裝置已被解鎖，請重新啟動 Tails 系統以便將它再次鎖定。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "額外的設定"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "添加一個額外設定"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "在大多數的情況下，預設的設定值是很安全的。若您想要增加個人化的設定，請按下方的「+」按鈕。"
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "檔案容器"
1
0
06 Oct '19
commit 61a342cafd8d7f75491db6a2728a8b1eb3bde85a
Author: Damian Johnson <atagar(a)torproject.org>
Date: Thu Oct 3 16:27:59 2019 -0700
Drop public_identity_key decyption argument
Turns out it's not used at all within the helper.
---
stem/descriptor/hidden_service.py | 4 ++--
stem/descriptor/hsv3_crypto.py | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/stem/descriptor/hidden_service.py b/stem/descriptor/hidden_service.py
index a20d853a..314e623a 100644
--- a/stem/descriptor/hidden_service.py
+++ b/stem/descriptor/hidden_service.py
@@ -607,14 +607,14 @@ class HiddenServiceDescriptorV3(BaseHiddenServiceDescriptor):
credential = hashlib.sha3_256(b'credential%s' % (identity_public_key)).digest()
subcredential = hashlib.sha3_256(b'subcredential%s%s' % (credential, blinded_key)).digest()
- outter_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_outter_layer(self.superencrypted, self.revision_counter, identity_public_key, blinded_key, subcredential)
+ outter_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_outter_layer(self.superencrypted, self.revision_counter, blinded_key, subcredential)
if outer_layer:
return outter_layer_plaintext
inner_layer_ciphertext = OuterLayer(outter_layer_plaintext).encrypted
- inner_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_inner_layer(inner_layer_ciphertext, self.revision_counter, identity_public_key, blinded_key, subcredential)
+ inner_layer_plaintext = stem.descriptor.hsv3_crypto.decrypt_inner_layer(inner_layer_ciphertext, self.revision_counter, blinded_key, subcredential)
return inner_layer_plaintext
diff --git a/stem/descriptor/hsv3_crypto.py b/stem/descriptor/hsv3_crypto.py
index 078d71b4..9acb5242 100644
--- a/stem/descriptor/hsv3_crypto.py
+++ b/stem/descriptor/hsv3_crypto.py
@@ -80,7 +80,7 @@ def _ciphertext_mac_is_valid(key, salt, ciphertext, mac):
return my_mac == mac
-def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_identity_key, subcredential, secret_data, string_constant):
+def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, subcredential, secret_data, string_constant):
from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
from cryptography.hazmat.backends import default_backend
@@ -100,7 +100,6 @@ def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_iden
# INT_8(revision_counter)
rev_counter_int_8 = struct.pack('>Q', revision_counter)
secret_input = b'%s%s%s' % (secret_data, subcredential, rev_counter_int_8)
- secret_input = secret_input
kdf = hashlib.shake_256(b'%s%s%s' % (secret_input, salt, string_constant))
keys = kdf.digest(S_KEY_LEN + S_IV_LEN + MAC_KEY_LEN)
@@ -121,9 +120,9 @@ def _decrypt_descriptor_layer(ciphertext_blob_b64, revision_counter, public_iden
return decrypted
-def decrypt_outter_layer(superencrypted_blob_b64, revision_counter, public_identity_key, blinded_key, subcredential):
- return _decrypt_descriptor_layer(superencrypted_blob_b64, revision_counter, public_identity_key, subcredential, blinded_key, b'hsdir-superencrypted-data')
+def decrypt_outter_layer(superencrypted_blob_b64, revision_counter, blinded_key, subcredential):
+ return _decrypt_descriptor_layer(superencrypted_blob_b64, revision_counter, subcredential, blinded_key, b'hsdir-superencrypted-data')
-def decrypt_inner_layer(encrypted_blob_b64, revision_counter, public_identity_key, blinded_key, subcredential):
- return _decrypt_descriptor_layer(encrypted_blob_b64, revision_counter, public_identity_key, subcredential, blinded_key, b'hsdir-encrypted-data')
+def decrypt_inner_layer(encrypted_blob_b64, revision_counter, blinded_key, subcredential):
+ return _decrypt_descriptor_layer(encrypted_blob_b64, revision_counter, subcredential, blinded_key, b'hsdir-encrypted-data')
1
0
06 Oct '19
commit f1e1902550155b04a4ce3b0c5edfb5420fc11c86
Merge: 6790035c 80def07e
Author: Damian Johnson <atagar(a)torproject.org>
Date: Sat Oct 5 19:03:37 2019 -0700
Hidden service v3 descriptor decryption
Descriptor decrypt() method that decrypts and parses inner and outer layers. Many
thanks to George for all the help with the crypto!
https://trac.torproject.org/projects/tor/ticket/31369
stem/client/datatype.py | 145 ++++++-
stem/descriptor/certificate.py | 118 ++++--
stem/descriptor/hidden_service.py | 385 +++++++++++++++++-
stem/descriptor/server_descriptor.py | 7 +-
stem/prereq.py | 47 ++-
stem/util/connection.py | 3 +
stem/util/tor_tools.py | 24 +-
test/settings.cfg | 3 +
test/unit/client/link_specifier.py | 59 +++
test/unit/descriptor/certificate.py | 2 +-
test/unit/descriptor/data/hidden_service_v3 | 430 ++++++++++-----------
.../descriptor/data/hidden_service_v3_inner_layer | 89 +++++
.../descriptor/data/hidden_service_v3_outer_layer | Bin 0 -> 10000 bytes
test/unit/descriptor/hidden_service_v3.py | 115 +++++-
14 files changed, 1149 insertions(+), 278 deletions(-)
1
0