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

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tails-greeter] Update translations for tails-greeter
From: translation@xxxxxxxxxxxxxx
Date: Sat, 10 Jun 2017 10:47:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 10 Jun 2017 06:48:39 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit bc26bc1b70507017f3876a8aa46fb387cd14e637
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sat Jun 10 10:46:55 2017 +0000

    Update translations for tails-greeter
---
 ach/ach.po                  | 306 ++++++++++++++++++++++++-----------
 ady/ady.po                  | 306 ++++++++++++++++++++++++-----------
 af/af.po                    | 308 ++++++++++++++++++++++++-----------
 ak/ak.po                    | 306 ++++++++++++++++++++++++-----------
 am/am.po                    | 306 ++++++++++++++++++++++++-----------
 ar/ar.po                    | 376 +++++++++++++++++++++++++++---------------
 arn/arn.po                  | 306 ++++++++++++++++++++++++-----------
 ast/ast.po                  | 324 +++++++++++++++++++++++++------------
 az/az.po                    | 378 ++++++++++++++++++++++++++++---------------
 ba/ba.po                    | 306 ++++++++++++++++++++++++-----------
 be/be.po                    | 376 +++++++++++++++++++++++++++---------------
 bg/bg.po                    | 378 ++++++++++++++++++++++++++++---------------
 bn/bn.po                    | 322 ++++++++++++++++++++++++------------
 bn_BD/bn_BD.po              | 306 ++++++++++++++++++++++++-----------
 bn_IN/bn_IN.po              | 306 ++++++++++++++++++++++++-----------
 bo/bo.po                    | 306 ++++++++++++++++++++++++-----------
 br/br.po                    | 306 ++++++++++++++++++++++++-----------
 brx/brx.po                  | 306 ++++++++++++++++++++++++-----------
 bs/bs.po                    | 320 ++++++++++++++++++++++++------------
 ca/ca.po                    | 380 ++++++++++++++++++++++++++++---------------
 ceb/ceb.po                  | 306 ++++++++++++++++++++++++-----------
 cs/cs.po                    | 376 +++++++++++++++++++++++++++---------------
 csb/csb.po                  | 306 ++++++++++++++++++++++++-----------
 cv/cv.po                    | 312 ++++++++++++++++++++++++-----------
 cy/cy.po                    | 342 ++++++++++++++++++++++++++-------------
 da/da.po                    | 378 ++++++++++++++++++++++++++++---------------
 de/de.po                    | 376 +++++++++++++++++++++++++++---------------
 dz/dz.po                    | 306 ++++++++++++++++++++++++-----------
 el/el.po                    | 378 ++++++++++++++++++++++++++++---------------
 en_GB/en_GB.po              | 376 +++++++++++++++++++++++++++---------------
 eo/eo.po                    | 378 ++++++++++++++++++++++++++++---------------
 es/es.po                    | 378 ++++++++++++++++++++++++++++---------------
 es_AR/es_AR.po              | 378 ++++++++++++++++++++++++++++---------------
 es_CL/es_CL.po              | 308 ++++++++++++++++++++++++-----------
 es_CO/es_CO.po              | 314 ++++++++++++++++++++++++-----------
 es_MX/es_MX.po              | 376 +++++++++++++++++++++++++++---------------
 et/et.po                    | 310 ++++++++++++++++++++++++-----------
 eu/eu.po                    | 378 ++++++++++++++++++++++++++++---------------
 fa/fa.po                    | 378 ++++++++++++++++++++++++++++---------------
 fi/fi.po                    | 378 ++++++++++++++++++++++++++++---------------
 fil/fil.po                  | 324 +++++++++++++++++++++++++------------
 fo/fo.po                    | 310 ++++++++++++++++++++++++-----------
 fr/fr.po                    | 380 ++++++++++++++++++++++++++++---------------
 fr_CA/fr_CA.po              | 384 ++++++++++++++++++++++++++++---------------
 fur/fur.po                  | 306 ++++++++++++++++++++++++-----------
 fy/fy.po                    | 326 +++++++++++++++++++++++++------------
 ga/ga.po                    | 306 ++++++++++++++++++++++++-----------
 gd/gd.po                    | 310 ++++++++++++++++++++++++-----------
 gl/gl.po                    | 378 ++++++++++++++++++++++++++++---------------
 gu/gu.po                    | 308 ++++++++++++++++++++++++-----------
 gu_IN/gu_IN.po              | 306 ++++++++++++++++++++++++-----------
 gun/gun.po                  | 306 ++++++++++++++++++++++++-----------
 ha/ha.po                    | 306 ++++++++++++++++++++++++-----------
 he/he.po                    | 378 ++++++++++++++++++++++++++++---------------
 hi/hi.po                    | 316 +++++++++++++++++++++++++-----------
 hr/hr.po                    | 334 ++++++++++++++++++++++++++------------
 hr_HR/hr_HR.po              | 378 ++++++++++++++++++++++++++++---------------
 ht/ht.po                    | 306 ++++++++++++++++++++++++-----------
 hu/hu.po                    | 378 ++++++++++++++++++++++++++++---------------
 hy/hy.po                    | 306 ++++++++++++++++++++++++-----------
 ia/ia.po                    | 314 ++++++++++++++++++++++++-----------
 id/id.po                    | 382 ++++++++++++++++++++++++++++---------------
 is/is.po                    | 378 ++++++++++++++++++++++++++++---------------
 it/it.po                    | 380 ++++++++++++++++++++++++++++---------------
 ja/ja.po                    | 376 +++++++++++++++++++++++++++---------------
 jv/jv.po                    | 306 ++++++++++++++++++++++++-----------
 ka/ka.po                    | 334 ++++++++++++++++++++++++++------------
 kk/kk.po                    | 308 ++++++++++++++++++++++++-----------
 km/km.po                    | 378 ++++++++++++++++++++++++++++---------------
 kn/kn.po                    | 354 ++++++++++++++++++++++++++--------------
 ko/ko.po                    | 380 ++++++++++++++++++++++++++++---------------
 ko_KR/ko_KR.po              | 354 ++++++++++++++++++++++++++--------------
 ku/ku.po                    | 306 ++++++++++++++++++++++++-----------
 ku_IQ/ku_IQ.po              | 320 ++++++++++++++++++++++++------------
 kw/kw.po                    | 306 ++++++++++++++++++++++++-----------
 ky/ky.po                    | 308 ++++++++++++++++++++++++-----------
 la/la.po                    | 378 ++++++++++++++++++++++++++++---------------
 lb/lb.po                    | 378 ++++++++++++++++++++++++++++---------------
 lg/lg.po                    | 306 ++++++++++++++++++++++++-----------
 ln/ln.po                    | 306 ++++++++++++++++++++++++-----------
 lo/lo.po                    | 314 ++++++++++++++++++++++++-----------
 lt/lt.po                    | 378 ++++++++++++++++++++++++++++---------------
 lv/lv.po                    | 380 ++++++++++++++++++++++++++++---------------
 mg/mg.po                    | 306 ++++++++++++++++++++++++-----------
 mi/mi.po                    | 306 ++++++++++++++++++++++++-----------
 mk/mk.po                    | 306 ++++++++++++++++++++++++-----------
 ml/ml.po                    | 306 ++++++++++++++++++++++++-----------
 mn/mn.po                    | 306 ++++++++++++++++++++++++-----------
 mr/mr.po                    | 314 ++++++++++++++++++++++++-----------
 ms_MY/ms_MY.po              | 344 ++++++++++++++++++++++++++-------------
 mt/mt.po                    | 306 ++++++++++++++++++++++++-----------
 my/my.po                    | 316 +++++++++++++++++++++++++-----------
 nah/nah.po                  | 306 ++++++++++++++++++++++++-----------
 nap/nap.po                  | 306 ++++++++++++++++++++++++-----------
 nb/nb.po                    | 378 ++++++++++++++++++++++++++++---------------
 nds/nds.po                  | 306 ++++++++++++++++++++++++-----------
 ne/ne.po                    | 306 ++++++++++++++++++++++++-----------
 nl/nl.po                    | 378 ++++++++++++++++++++++++++++---------------
 nl_BE/nl_BE.po              | 364 +++++++++++++++++++++++++++--------------
 nn/nn.po                    | 376 +++++++++++++++++++++++++++---------------
 nso/nso.po                  | 306 ++++++++++++++++++++++++-----------
 oc/oc.po                    | 306 ++++++++++++++++++++++++-----------
 om/om.po                    | 308 ++++++++++++++++++++++++-----------
 or/or.po                    | 306 ++++++++++++++++++++++++-----------
 pa/pa.po                    | 356 ++++++++++++++++++++++++++--------------
 pap/pap.po                  | 306 ++++++++++++++++++++++++-----------
 pl/pl.po                    | 378 ++++++++++++++++++++++++++++---------------
 pms/pms.po                  | 306 ++++++++++++++++++++++++-----------
 ps/ps.po                    | 306 ++++++++++++++++++++++++-----------
 pt/pt.po                    | 378 ++++++++++++++++++++++++++++---------------
 pt_BR/pt_BR.po              | 378 ++++++++++++++++++++++++++++---------------
 ro/ro.po                    | 378 ++++++++++++++++++++++++++++---------------
 ru/ru.po                    | 380 ++++++++++++++++++++++++++++---------------
 ru@petr1708/ru@xxxxxxxxxxx  | 312 ++++++++++++++++++++++++-----------
 scn/scn.po                  | 306 ++++++++++++++++++++++++-----------
 sco/sco.po                  | 306 ++++++++++++++++++++++++-----------
 si_LK/si_LK.po              | 354 ++++++++++++++++++++++++++--------------
 sk/sk.po                    | 376 +++++++++++++++++++++++++++---------------
 sk_SK/sk_SK.po              | 382 ++++++++++++++++++++++++++++---------------
 sl/sl.po                    | 354 ++++++++++++++++++++++++++--------------
 sl_SI/sl_SI.po              | 376 +++++++++++++++++++++++++++---------------
 sn/sn.po                    | 306 ++++++++++++++++++++++++-----------
 so/so.po                    | 306 ++++++++++++++++++++++++-----------
 son/son.po                  | 306 ++++++++++++++++++++++++-----------
 sq/sq.po                    | 378 ++++++++++++++++++++++++++++---------------
 sr/sr.po                    | 358 ++++++++++++++++++++++++++--------------
 sr@latin/sr@xxxxxxxx        | 378 ++++++++++++++++++++++++++++---------------
 st/st.po                    | 306 ++++++++++++++++++++++++-----------
 su/su.po                    | 306 ++++++++++++++++++++++++-----------
 sv/sv.po                    | 380 ++++++++++++++++++++++++++++---------------
 sw/sw.po                    | 306 ++++++++++++++++++++++++-----------
 szl/szl.po                  | 306 ++++++++++++++++++++++++-----------
 ta/ta.po                    | 376 +++++++++++++++++++++++++++---------------
 te/te.po                    | 306 ++++++++++++++++++++++++-----------
 te_IN/te_IN.po              | 308 ++++++++++++++++++++++++-----------
 templates/tails-greeter.pot | 386 +++++++++++++++++++++++++++++---------------
 tg/tg.po                    | 306 ++++++++++++++++++++++++-----------
 th/th.po                    | 360 +++++++++++++++++++++++++++--------------
 ti/ti.po                    | 306 ++++++++++++++++++++++++-----------
 tk/tk.po                    | 306 ++++++++++++++++++++++++-----------
 tr/tr.po                    | 380 ++++++++++++++++++++++++++++---------------
 tzm/tzm.po                  | 308 ++++++++++++++++++++++++-----------
 ug@Arab/ug@xxxxxxx          | 318 ++++++++++++++++++++++++------------
 uk/uk.po                    | 376 +++++++++++++++++++++++++++---------------
 ur/ur.po                    | 316 +++++++++++++++++++++++++-----------
 ur_PK/ur_PK.po              | 318 ++++++++++++++++++++++++------------
 uz/uz.po                    | 314 ++++++++++++++++++++++++-----------
 ve/ve.po                    | 306 ++++++++++++++++++++++++-----------
 vi/vi.po                    | 378 ++++++++++++++++++++++++++++---------------
 wa/wa.po                    | 306 ++++++++++++++++++++++++-----------
 wo/wo.po                    | 306 ++++++++++++++++++++++++-----------
 zh_CN/zh_CN.po              | 380 ++++++++++++++++++++++++++++---------------
 zh_HK/zh_HK.po              | 386 +++++++++++++++++++++++++++++---------------
 zh_TW/zh_TW.po              | 378 ++++++++++++++++++++++++++++---------------
 zu/zu.po                    | 306 ++++++++++++++++++++++++-----------
 155 files changed, 35392 insertions(+), 16792 deletions(-)

diff --git a/ach/ach.po b/ach/ach.po
index 4333dfd..ff9edc5 100644
--- a/ach/ach.po
+++ b/ach/ach.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ady/ady.po b/ady/ady.po
index 5450d7b..a8301e6 100644
--- a/ady/ady.po
+++ b/ady/ady.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Adyghe (http://www.transifex.com/otf/torproject/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/af/af.po b/af/af.po
index f3e19d6..204ad36 100644
--- a/af/af.po
+++ b/af/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Sleutelwoord"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ak/ak.po b/ak/ak.po
index dcaa991..3fb52b5 100644
--- a/ak/ak.po
+++ b/ak/ak.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Akan (http://www.transifex.com/otf/torproject/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/am/am.po b/am/am.po
index 85a5778..6e8ba16 100644
--- a/am/am.po
+++ b/am/am.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ar/ar.po b/ar/ar.po
index a7f613e..64536ef 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -28,170 +28,290 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ø¥Ù?Ù? Ø§Ù?Ø£Ù?Ø§Ù?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ø§Ù?Ø¯Ø®Ù?Ù?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ø§Ù?Ù?Ø§Ù? Ø¨Ù? Ù?Ù? ØªÙ?Ù?Ø²"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ù?Ù? ØªØ±ØºØ¨ Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ø³Ø§ØØ© Ø¯Ø§Ø¦Ù?Ø© Ø¹Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ø§Ù?ØµÙ?Ø¨Ø?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ø§Ù?Ù?Ø«Ø§Ø¦Ù?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ù?Ø¹Ù?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ù?Ø§"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ø¹Ø¨Ø§Ø±Ø© Ø§Ù?Ù?Ø±Ù?Ø±:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Ù?Ù?Ù?Ø±Ø§Ø¡Ø© Ù?Ù?Ø·Ø?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Ø¹Ø¨Ø§Ø±Ø© Ø§Ù?Ù?Ø±Ù?Ø± ØºÙ?Ø± ØµØÙ?ØØ©. Ø§Ù?Ø±Ø¬Ø§Ø¡ Ø§Ù?Ù?ØØ§Ù?Ù?Ø© Ù?Ø±Ø© Ø§Ø®Ø±Ù?</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ø®Ù?Ø§Ø±Ø§Øª Ø£Ù?Ø«Ø±Ø?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø± Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?Ø¥Ø¯Ø§Ø±Ø©"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ø§Ù?Ù?Ø«Ø§Ø¦Ù?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ø§Ø¯Ø®Ù? Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø± Ø§Ù?Ø®Ø§ØµØ© Ø¨Ø§Ù?Ø¥Ø¯Ø§Ø±Ø© Ù?Ù? ØØ§Ù? Ù?Ù?Øª ØªØØªØ§Ø¬ Ø¥Ù?Ù? Ø¹Ù?Ù? ØªØºÙ?Ù?Ø±Ø§Øª Ø¥Ø¯Ø§Ø±Ù?Ø©. \nÙ?Ø¥Ù?Ø§ Ø³Ù?Ø¹Ø·Ù? Ù?Ø°Ø§ Ø§Ù?Ø®Ù?Ø§Ø± Ù?ØªØØ³Ù?Ù? Ø§Ù?Ø£Ù?Ù?."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø±:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ØªØÙ?Ù? Ù?Ù? Ø£Ù? Ø§Ø¹Ø¯ Ù?ØªØ§Ø¨Ø© Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø±:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø³Ø± ØºÙ?Ø± Ù?ØªØ·Ø§Ø¨Ù?Ø©</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ø§Ù?ØªØØ§Ù? Ø¹Ù?Ù?Ø§Ù? MAC "
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ø§Ù?Ù?Ø«Ø§Ø¦Ù?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ø§Ù?ØªØØ§Ù? Ø¹Ù?Ø§Ù?Ù?Ù? MAC Ø£Ø®Ø±Ù? Ù?Ø®Ù?Ù? Ø£Ø±Ù?Ø§Ù? ØªØ³Ù?Ø³Ù? Ø¨Ø·Ø§Ù?Ø§Øª Ø´Ø¨Ù?ØªÙ? Ù?Ù?Ø´Ø¨Ù?Ø§Øª Ø§Ù?Ù?ØÙ?Ù?Ø©. Ù?Ø°Ø§ Ø§Ù?Ø£Ù?Ø± Ù?Ø³Ø§Ø¹Ø¯Ù? Ø¹Ù?Ù? Ø¥Ø®Ù?Ø§Ø¡ Ù?Ù?Ù?Ø¹Ù? Ø§Ù?Ø¬ØºØ±Ø§Ù?Ù?."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ø§Ù?ØªØØ§Ù? Ø¹Ù?Ø§Ù?Ù?Ù? Ù?ØØ¯Ø§Øª Ø§Ù?ØªØÙ?Ù? Ù?Ù? Ù?ØµÙ?Ù? Ø§Ù?Ù?Ø³Ø§Ø¦Ø· Ø£Ø£Ù?Ù? Ø¨Ø´Ù?Ù? Ø¹Ø§Ù? Ù?Ù?Ù?Ù?Ù? Ø£Ù?Ø¶Ø§ Ù?Ø¯ Ù?Ø«Ù?Ø± Ø§Ù?Ø´Ù?Ù?Ù? Ø£Ù? Ù?Ø³Ø¨Ø¨ Ù?Ø´Ø§Ù?Ù? Ù?Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø´Ø¨Ù?Ø©."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ø§Ù?ØªØØ§Ù? Ø¹Ù?Ø§Ù?Ù?Ù? Ø¬Ù?Ù?Ø¹ Ù?ØØ¯Ø§Øª Ø§Ù?ØªØÙ?Ù? Ù?Ù? Ù?ØµÙ?Ù? Ø§Ù?Ù?Ø³Ø§Ø¦Ø·"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ØªÙ?Ù?Ù?Ù? Ø§Ù?Ø´Ø¨Ù?Ø©"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ø§Ù?Ù?Ø«Ø§Ø¦Ù?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ø§ØªØµØ§Ù? Ù?Ø°Ø§ Ø§Ù?ØØ§Ø³Ø¨ Ø¨Ø§Ù?Ø¥Ù?ØªØ±Ù?Øª Ø®Ø§Ù?Ù? Ù?Ù? Ø§Ù?Ø¹Ù?Ø§Ø¦Ù?. Ø£Ù?Øª ØªÙ?Ø¯ Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø´Ø¨Ù?Ø© Tor Ø¨Ø´Ù?Ù? Ù?Ø¨Ø§Ø´Ø±."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ø¹Ø·Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ø´Ø¨Ù?Ø§Øª"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "."
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ø§Ù?Ù?ØºØ©"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ù?ØÙ?Ù?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Ø§Ù?ØªØµÙ?Ù?Ù?"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist Ù?Ø´Ù? Ù? Ù?Ù?Ø¯ Ø§Ù?Ø¹Ù?Ø¯Ø© Ù?Ù? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup Ù?Ø´Ù? Ù? Ù?Ù?Ø¯ Ø§Ù?Ø¹Ù?Ø¯Ø© Ù?Ù? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist Ù?Ø´Ù? Ù? Ù?Ù?Ø¯ Ø§Ù?Ø¹Ù?Ø¯Ø© Ù?Ù? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ø¢Ø®Ø±..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/arn/arn.po b/arn/arn.po
index 1610c8c..0c603c5 100644
--- a/arn/arn.po
+++ b/arn/arn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Mapudungun (http://www.transifex.com/otf/torproject/language/arn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: arn\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ast/ast.po b/ast/ast.po
index 6564df9..cbe3ecf 100644
--- a/ast/ast.po
+++ b/ast/ast.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Aniciar sesiÃ³n"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "BienllegÃ¡u a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Pallabra clave:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "NamÃ¡i llectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "MÃ¡s opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "AlministraciÃ³n de contraseÃ±a"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/az/az.po b/az/az.po
index 09cb7ec..80288ad 100644
--- a/az/az.po
+++ b/az/az.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-09 12:37+0000\n"
-"Last-Translator: Nikafn <appone6@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,170 +21,290 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "YÃ¶nlÉ?ndir"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Daxil Ol"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails -É? XoÅ? GÉ?ldiniz"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "DavamlÄ± istifadÉ??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">SÉ?nÉ?dlÉ?Å?mÉ?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "BÉ?li"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Xeyr"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "KÃ¶mÉ?kÃ§i ifadÉ?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "YalnÄ±z-Oxunulur?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>YanlÄ±Å? ifadÉ?. LÃ¼tfÉ?n, bir daha sÄ±na.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Daha Ã§ox seÃ§É?nÉ?k?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrasiya Å?ifrÉ?si"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">SÉ?nÉ?dlÉ?Å?mÉ?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Administrator vÉ?zifÉ?lÉ?rini yerinÉ? yetirmÉ?yÉ? ehtiyacÄ±n olduqda administratorun Å?ifrÉ?sini daxil et.\nÆ?ks halda daha yaxÅ?Ä± tÉ?hlÃ¼kÉ?sizlik Ã¼Ã§Ã¼n bu deaktivÉ? edilÉ?cÉ?k."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Å?ifrÉ?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Å?ifrÉ?ni TÉ?sdiqlÉ?yin:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Å?ifrÉ?lÉ?r eyni deyil</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC Ã¼nvan aldadÄ±cÄ±"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">SÉ?nÉ?dlÉ?Å?mÉ?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC Ã¼nvanlarÄ±n aldadÄ±lmasÄ± yerli Å?É?bÉ?kÉ?yÉ? olan Å?É?bÉ?kÉ? kartlarÄ±nÄ±n seriya nÃ¶mrÉ?sini gizlÉ?dir. Bu sÉ?nÉ? coÄ?rafi mÉ?kanÄ±nÄ± gizlÉ?mÉ?yÉ? Å?É?rait yarada bilÉ?r."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "MAC Ã¼nvan aldadÄ±cÄ±sÄ±nÄ± istifadÉ? etmÉ?k Ã¼mumiyyÉ?tlÉ? daha tÉ?hlÃ¼kÉ?sizdir, amma bu É?lavÉ? olaraq Å?Ã¼bhÉ? yarada vÉ? ya Å?É?bÉ?kÉ? É?laqÉ? problemlÉ?rinÉ? sÉ?bÉ?b ola bilÉ?r."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "BÃ¼tÃ¼n MAC Ã¼nvanlarÄ±nÄ± aldat"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Å?É?bÉ?kÉ? konfiqurasiyasÄ±"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">SÉ?nÉ?dlÉ?Å?mÉ?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Bu kompÃ¼terin internet É?laqÉ?si maneÉ?lÉ?rdÉ?n tÉ?mizlÉ?nmiÅ?dir. SÉ?n bir baÅ?a Tor Å?É?bÉ?kÉ?sinÉ? qoÅ?ulmaq istÉ?yirsÉ?n."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Bu kompÃ¼terin internet É?laqÉ?si senzuradan keÃ§irilmiÅ?, filterlÉ?nmiÅ? vÉ? ya proksilÉ?nmiÅ?dir. SÉ?n kÃ¶rpÃ¼, tÉ?hlÃ¼kÉ?sizlik divarÄ± vÉ? ya proksi parametrlÉ?rini konfiqurasiya etmÉ?lisÉ?n."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "BÃ¼tÃ¼n Å?É?bÉ?kÉ?ni sÃ¶ndÃ¼r"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Dil"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Dil"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "GÃ¶rÃ¼nÃ¼Å?"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "canlÄ±-davamlÄ±lÄ±q %(returncode)s geri Å?ifrÉ? ilÉ? alÄ±nmadÄ±:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Ã¶lÃ¼parametr crypt %(returncode)s geri Å?ifrÉ? ilÉ? alÄ±nmadÄ±:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "canlÄ±-davamlÄ±lÄ±q %(returncode)s geri Å?ifrÉ? ilÉ? alÄ±nmadÄ±:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "DigÉ?r..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ba/ba.po b/ba/ba.po
index 5443eb1..51de0b4 100644
--- a/ba/ba.po
+++ b/ba/ba.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bashkir (http://www.transifex.com/otf/torproject/language/ba/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ba\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/be/be.po b/be/be.po
index f34d518..1c160d2 100644
--- a/be/be.po
+++ b/be/be.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ð?Ð°Ð»ÐµÐ¹"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ð£Ð²Ð°Ð¹Ñ?Ñ?Ñ?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ð?Ñ?Ñ?Ð°ÐµÐ¼ Ñ? Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ð?Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ñ?Ð¾Ñ?Ð²Ð°Ñ?Ñ? Ñ?Ñ?Ð°Ð»Ð°Ðµ Ñ?Ñ?Ð¾Ð²Ñ?Ñ?Ñ?Ð°?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ð?Ð°ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ð¢Ð°Ðº"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ð?Ðµ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Ð¢Ð¾Ð»Ñ?ÐºÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð½Ðµ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Ð?Ñ?Ð´Ð·ÐµÐ¹Ñ?Ð½Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ?. Ð?Ð°Ñ?Ð¿Ñ?Ð°Ð±Ñ?Ð¹Ñ?Ðµ Ñ?Ð·Ð½Ð¾Ñ?.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ã¡Ñ?Ð»ÐµÐ½Ð½Ñ?Ñ??"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ð°Ñ?Ð°"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ð?Ð°ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ð?Ð°Ð´Ð°Ð¹Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð´Ð° ÐºÐ¾Ð½Ñ?Ð° Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ð°Ñ?Ð°, ÐºÐ°Ð»Ñ? Ð²Ð°Ð¼ Ñ?Ñ?Ñ?Ð±Ð° Ð²Ñ?ÐºÐ¾Ð½Ð²Ð°Ñ?Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ?.\nÐ?Ð½Ð°ÐºÑ? Ñ?Ð½ Ð±Ñ?Ð´Ð·Ðµ Ð°Ð´ÐºÐ»Ñ?Ñ?Ð°Ð½Ñ? Ð´Ð»Ñ? Ð±Ð¾Ð»Ñ?Ñ?Ð°Ð¹ Ð±Ñ?Ñ?Ð¿ÐµÐºÑ?."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÑ?Ð´Ð¶Ð°Ð½Ð½Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ?:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð½Ðµ Ñ?Ñ?Ð¿Ð°Ð´Ð°Ñ?Ñ?Ñ?</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ð?Ð°Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?Ð°Ñ?Ð°Ñ?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ð?Ð°ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ð?Ð°Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?Ð°Ñ?Ð°Ñ? Ñ?Ð°Ð²Ð°Ðµ Ñ?ÐµÑ?Ñ?Ð¹Ð½Ñ? Ð½Ñ?Ð¼Ð°Ñ? Ð²Ð°Ñ?Ð°Ð¹ Ñ?ÐµÑ?ÐºÐ°Ð²Ð°Ð¹ ÐºÐ°Ñ?Ñ?Ñ? Ñ? Ð»Ð°ÐºÐ°Ð»Ñ?Ð½Ñ?Ñ? Ñ?ÐµÑ?ÐºÐ°Ñ?. Ð?Ñ?Ñ?Ð° Ð¼Ð¾Ð¶Ð° Ð´Ð°Ð¿Ð°Ð¼Ð°Ð³Ñ?Ñ? Ð²Ð°Ð¼ Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð³ÐµÐ°Ð³Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ð°Ðµ Ð·Ð½Ð°Ñ?Ð¾Ð´Ð¶Ð°Ð½Ð½Ðµ."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ð?Ð°Ð·Ð²Ñ?Ñ?Ð°Ð¹, Ð±Ñ?Ñ?Ð¿ÐµÑ?Ð½ÐµÐ¹ Ð¿Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ? MAC-Ð°Ð´Ñ?Ð°Ñ?Ñ?, Ð°Ð»Ðµ Ð³Ñ?Ñ?Ð° Ð¼Ð¾Ð¶Ð° Ð²Ñ?ÐºÐ»Ñ?ÐºÐ°Ñ?Ñ? Ð¿Ð°Ð´Ð°Ð·Ñ?Ð¾Ð½Ð°Ñ?Ñ?Ñ? Ñ?Ñ? Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?Ð°Ð±Ð»ÐµÐ¼Ñ? Ñ?Ð° Ð·Ð»Ñ?Ñ?Ñ?Ð½Ð½ÐµÐ¼."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ð?Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ? Ñ?Ñ?Ðµ MAC-Ð°Ð´Ñ?Ð°Ñ?Ñ?"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Ð?Ð°Ð½Ñ?Ñ?Ð³Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ñ?ÐµÑ?ÐºÑ?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ð?Ð°ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ð?Ð»Ñ?Ñ?Ñ?Ð½Ð½Ðµ Ð³Ñ?Ñ?Ð°Ð³Ð° ÐºÐ°Ð¼Ð¿Ñ?Ñ?Ð°Ñ?Ð° Ð· Ñ?Ð½Ñ?Ñ?Ñ?Ð½Ñ?Ñ?Ð°Ð¼ Ð¿Ð°Ð·Ð±Ð°Ñ?Ð»ÐµÐ½Ð° Ð¿ÐµÑ?Ð°Ñ?ÐºÐ¾Ð´. Ð?Ñ? Ñ?Ð°Ñ?ÐµÐ»Ñ? Ð± Ð·Ð»Ñ?Ñ?Ñ?Ñ?Ñ?Ð° Ð½ÐµÐ¿Ð°Ñ?Ñ?Ñ?Ð´Ð½Ð° Ð· Ñ?ÐµÑ?ÐºÐ°Ð¹ Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ð?Ð¾Ð²Ð°"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ð?Ð°ÐºÐ°Ð»Ñ?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Ð Ð°Ñ?ÐºÐ»Ð°Ð´ÐºÐ°"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist Ð·Ð²Ð°Ð»Ñ?Ñ?Ñ?Ñ? Ð· ÐºÐ¾Ð´Ð°Ð¼ %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup Ð·Ð²Ð°Ð»Ñ?Ñ?Ñ?Ñ? Ð· ÐºÐ¾Ð´Ð°Ð¼ %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist Ð·Ð²Ð°Ð»Ñ?Ñ?Ñ?Ñ? Ð· ÐºÐ¾Ð´Ð°Ð¼ %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ð?Ð½Ñ?Ð°Ðµ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/bg/bg.po b/bg/bg.po
index b993c5f..6d58b4a 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-24 16:30+0200\n"
-"PO-Revision-Date: 2016-05-26 09:26+0000\n"
-"Last-Translator: Gabriel Radev <gabosss@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ð?Ñ?Ð¾Ð´"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ð?Ð¾Ð±Ñ?Ðµ Ð´Ð¾Ñ?Ð»Ð¸ Ð² Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ð?Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ñ?Ñ?Ð²Ð¾?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ð?Ð°"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ð?Ðµ"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ð¢Ð°Ð¹Ð½Ð° Ñ?Ñ?Ð°Ð·Ð°:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Ð¡Ð°Ð¼Ð¾ Ð·Ð° Ñ?ÐµÑ?ÐµÐ½Ðµ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Ð?Ñ?ÐµÑ?Ð½Ð° Ð¢Ð°Ð¹Ð½Ð° Ñ?Ñ?Ð°Ð·Ð°. Ð?Ð¾Ð»Ñ?, Ð¾Ð¿Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ð¾.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ð?Ð¾Ð²ÐµÑ?Ðµ Ð²Ñ?Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ?ÐºÐ°Ñ?Ð° Ð¿Ð°Ñ?Ð¾Ð»Ð°"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð°Ñ?Ð¾Ð»Ð°, Ð² Ñ?Ð»Ñ?Ñ?Ð°Ð¹, Ñ?Ðµ Ðµ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð·Ð° Ð¸Ð·Ð¿Ñ?Ð»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð²Ð½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸. â??  Ð? Ð¿Ñ?Ð¾Ñ?Ð¸Ð²ÐµÐ½ Ñ?Ð»Ñ?Ñ?Ð°Ð¹ Ñ?Ðµ Ð±Ñ?Ð´Ðµ Ð·Ð°Ð±Ñ?Ð°Ð½ÐµÐ½Ð¾ Ð·Ð° Ð¿Ð¾-Ð³Ð¾Ð»Ñ?Ð¼Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ð°:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Ð?Ð¾Ñ?Ð²Ñ?Ñ?Ð´Ð¸ Ð?Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð°:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Ð?Ð°Ñ?Ð¾Ð»Ð¸Ñ?Ðµ Ð½Ðµ Ñ?Ñ?Ð²Ð¿Ð°Ð´Ð°Ñ?</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ð?Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° MAC  Ð°Ð´Ñ?ÐµÑ?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ð?Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð½ÐµÑ?Ð¾ Ð½Ð° MAC Ð°Ð´Ñ?ÐµÑ? Ñ?ÐºÑ?Ð¸Ð²Ð° Ñ?ÐµÑ?Ð¸Ð¹Ð½Ð°Ñ? Ð½Ð¾Ð¼ÐµÑ? Ð½Ð° Ð²Ð°Ñ?Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð° ÐºÐ°Ñ?Ñ?Ð°. Ð¢Ð¾Ð²Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ð¾Ð¼Ð°Ð³Ð½Ðµ Ð·Ð° Ð¿Ñ?Ð¸ÐºÑ?Ð¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð³ÐµÐ¾Ð³Ñ?Ð°Ñ?Ñ?ÐºÐ¾Ñ?Ð¾ Ð²Ð¸ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ð?Ð¾ Ð¿Ñ?Ð¸Ð½Ñ?Ð¸Ð¿ Ðµ Ð¿Ð¾-Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾ Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð¿Ñ?Ñ?Ð¸Ð½Ð³ Ð½Ð° MAC Ð°Ð´Ñ?ÐµÑ?Ð¸, Ð½Ð¾ Ñ?Ð¾Ð²Ð° Ð¼Ð¾Ð¶Ðµ Ñ?Ñ?Ñ?Ð¾ Ñ?Ð°ÐºÐ° Ð´Ð° Ð¿Ñ?Ð¾Ð±Ñ?Ð´Ð¸ Ñ?Ñ?Ð¼Ð½ÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð° Ð²Ñ?Ñ?Ð·ÐºÐ°."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ð¡Ð¿Ñ?Ñ?Ð¸Ð½Ð³ Ð·Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ MAC Ð°Ð´Ñ?ÐµÑ?Ð¸"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Ð?Ð¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ?Ð° Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ñ?Ñ? Ð½Ð° Ñ?Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ð½Ñ?Ð¼Ð° Ð¿Ñ?ÐµÑ?ÐºÐ¸. Ð?Ð¸Ñ?Ñ?Ðµ Ð¸Ñ?ÐºÐ°Ð»Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ð²Ñ?Ñ?Ð¶ÐµÑ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ ÐºÑ?Ð¼ Ð¢Ð¾Ñ?."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ð½Ð° Ñ?Ð¾Ð·Ð¸ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?Ñ? Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð°, Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸. Ð¢Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð½Ð° bridge, Ð·Ð°Ñ?Ð¸Ñ?Ð½Ð° Ñ?Ñ?ÐµÐ½Ð° Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ð?Ð·ÐºÐ»Ñ?Ñ?Ð¸ Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð¼Ñ?ÐµÐ¶Ð¸"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "-"
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ð?Ð·Ð¸Ðº"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ð?Ð¾ÐºÐ°Ð»"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Ð?Ñ?Ð¾Ñ?Ð¼Ð»ÐµÐ½Ð¸Ðµ"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:â?? %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup failed with return code %(returncode)s:â?? %(stdout)sâ?? %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:â?? %(stdout)sâ?? %(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ð?Ñ?Ñ?Ð³Ð¸..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/bn/bn.po b/bn/bn.po
index f191459..c42c77a 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-03 08:57+0000\n"
-"Last-Translator: Mahmud Numan <mahmudnuman@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: bn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à¦«à¦°à¦?à§?à¦¾à¦°à§?à¦¡"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "à¦?à§?à¦?à¦²à¦¸ à¦? à¦¸à§?à¦¬à¦¾à¦?à¦¤à¦®"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à¦¹à§?à¦¯à¦¾"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à¦¨à¦¾"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "à¦ªà¦¾à¦¸à¦?à¦¯à¦¼à¦¾à¦°à§?à¦¡:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "à¦à¦¾à¦·à¦¾"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "à¦?à¦¨à§?à¦¯à¦¾à¦¨à§?à¦¯..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po
index deda016..8558f40 100644
--- a/bn_BD/bn_BD.po
+++ b/bn_BD/bn_BD.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/bn_IN/bn_IN.po b/bn_IN/bn_IN.po
index c6e2045..e464e73 100644
--- a/bn_IN/bn_IN.po
+++ b/bn_IN/bn_IN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/otf/torproject/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/bo/bo.po b/bo/bo.po
index 8bdbb98..9aa4812 100644
--- a/bo/bo.po
+++ b/bo/bo.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Tibetan (http://www.transifex.com/otf/torproject/language/bo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/br/br.po b/br/br.po
index 6e7843b..4143fb8 100644
--- a/br/br.po
+++ b/br/br.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/brx/brx.po b/brx/brx.po
index b39607b..082a9c5 100644
--- a/brx/brx.po
+++ b/brx/brx.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bodo (http://www.transifex.com/otf/torproject/language/brx/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: brx\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/bs/bs.po b/bs/bs.po
index 068d62b..c50b6d0 100644
--- a/bs/bs.po
+++ b/bs/bs.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Proslijedi"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Å ifra"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
+
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "PodeÅ¡avanja mreÅ¾e"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ca/ca.po b/ca/ca.po
index 10584f4..f2947a0 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Albert <provisionalib@xxxxxxxxxxx>, 2013
-# Assumpta Anglada <assumptaanglada@xxxxxxxxx>, 2014
+# Assumpta <assumptaanglada@xxxxxxxxx>, 2014
 # David Anglada <codiobert@xxxxxxxxxxxx>, 2014
 # laia_, 2015
 # Norike Abe <norikeave@xxxxxxxxxxx>, 2013
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: laia_\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Endavant"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Entra"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Benvingut al Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utilitzar persistÃ¨ncia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DocumentaciÃ³</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "SÃ"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de contrasenya:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "NomÃ©s Escriptura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>La frase de contrasenya Ã©s incorrecta. Torna-ho a provar.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "MÃ©s opcions?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Contrasenya d'administraciÃ³"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DocumentaciÃ³</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Entreu una contrasenya d'administraciÃ³ si heu de realitzar tasques d'administraciÃ³.\nEn cas contrari, es deshabilitarÃ  per a una major seguretat."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contrasenya:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Comprova la contrasenya:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>La contrasenya no concorda</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "FalsificaciÃ³ d'adreÃ§a MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaciÃ³</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "La falsificaciÃ³ d'adreces MAC oculta el nÃºmero de sÃ¨rie de la targeta de xarxa a les xarxes locals. AixÃ² pot ajudar a ocultar la ubicaciÃ³ geogrÃ fica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "En general, Ã©s mÃ©s segur simular les adreces MAC, perÃ² tambÃ© podria aixecar sospites o provocar problemes de connexiÃ³ de xarxa."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Falsifica totes les adreces MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraciÃ³ de xarxa"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaciÃ³</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connexiÃ³ a Internet d'aquest equip estÃ  lliure d'obstacles. Podeu connectar-vos directament a la xarxa Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connexiÃ³ a Internet d'aquest equip estÃ  censurada, filtrada o contÃ© intermediaris. Cal configurar el pont, el tallafocs o la configuraciÃ³ del servidor intermediari."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desactiva tota la xarxa"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Llengua"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ConfiguraciÃ³ local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disseny"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ha fallat amb el codi de retorn %(returncode)s:â??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ha fallat amb el codi de retorn %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ha fallat amb el codi de retorn %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Altres..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ceb/ceb.po b/ceb/ceb.po
index 4655b85..7dfed02 100644
--- a/ceb/ceb.po
+++ b/ceb/ceb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Cebuano (http://www.transifex.com/otf/torproject/language/ceb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ceb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/cs/cs.po b/cs/cs.po
index 3aefab1..908226f 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "VpÅ?ed"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "PÅ?ihlÃ¡sit se"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "VÃtejte v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "PouÅ¾Ãt trvale?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentace</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ano"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "PÅ?ÃstupovÃ© heslo:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Jenom pro Ä?tenÃ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Å patnÃ© heslo. Zkuste to prosÃm znovu.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "VÃce moÅ¾nostÃ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "AdministraÄ?nÃ heslo"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentace</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "VloÅ¾te administraÄ?nÃ heslo v pÅ?ÃpadÄ?, Å¾e chcete provÃ¡dÄ?t administraÄ?nÃ Ãºlohy.\nJinak budou adminstraÄ?nÃ Ãºlohy vypnuty pro vyÅ¡Å¡Ã bezpeÄ?nosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Heslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "PotvrÄ?te heslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Hesla se neshodujÃ</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "FalÅ¡ovÃ¡nÃ MAC adresy"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentace</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "PodvrhovÃ¡nÃ MAC adresy schovÃ¡vÃ¡ sÃ©riovÃ© Ä?Ãslo vaÅ¡ich sÃÅ¥ovÃ½ch karet lokÃ¡lnÃm sÃtÃm. Toto mÅ¯Å¾e pomoci schovat vaÅ¡i geografickou polohu."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Je celkovÄ? bezpeÄ?nÄ?jÅ¡Ã schovat MAC adresy, ale takÃ© to mÅ¯Å¾e vznÃ©st podezÅ?enÃ nebo zpÅ¯sobit problÃ©my s pÅ?ipojenÃm k sÃti."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoofovat vÅ¡echny MAC adresy"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurace sÃtÄ?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentace</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "InternetovÃ© pÅ?ipojenÃ tohoto poÄ?ÃtaÄ?e nemÃ¡ v cestÄ? pÅ?ekÃ¡Å¾ky. Budete se chtÃt pÅ?ipojit pÅ?Ãmo do sÃtÄ? Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "InternetovÃ© pÅ?ipojenÃ tohoto poÄ?ÃtaÄ?e je cenzurovanÃ©, filtrovanÃ©, nebo je pouÅ¾ito proxy. PotÅ?ebujete nastavit most, firewall nebo proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ZakÃ¡zat vÅ¡echny sÃtÄ?"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jazyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "MÃstnÃ"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "RozvrÅ¾enÃ"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist selhal a vrÃ¡til kÃ³d %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup selhal a vrÃ¡til kÃ³d %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist selhal a vrÃ¡til kÃ³d %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "OstatnÃ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/csb/csb.po b/csb/csb.po
index b527963..9654133 100644
--- a/csb/csb.po
+++ b/csb/csb.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kashubian (http://www.transifex.com/otf/torproject/language/csb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: csb\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/cv/cv.po b/cv/cv.po
index d05559f..c042563 100644
--- a/cv/cv.po
+++ b/cv/cv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chuvash (http://www.transifex.com/otf/torproject/language/cv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: cv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ã?Ð°Ð¿Ð»Ð°"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ã?Ñ?Ðº"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð?Ä?Ð¼Ðµ Ñ?Ä?Ð¼Ð°Ñ?:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/cy/cy.po b/cy/cy.po
index de2bb43..026506b 100644
--- a/cy/cy.po
+++ b/cy/cy.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christopher Griffiths <transifex@xxxxxxxxxxxx>, 2016
+# ianto <transifex@xxxxxxxxxxxx>, 2016
 # Huw Waters <huwwaters@xxxxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Christopher Griffiths <transifex@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: cy\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ymlaen"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Mewngofnodi"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Croeso i Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Defnyddio parhad?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.cy.html\">Dogfennaeth</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ia"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Na"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.cy.html\">Dogfennaeth</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Gwirio Cyfrinair:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.cy.html\">Dogfennaeth</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.cy.html\">Dogfennaeth</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Iaith"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lleolaeth"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Arall..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/da/da.po b/da/da.po
index d78457a..ffc45b0 100644
--- a/da/da.po
+++ b/da/da.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-01-19 09:28+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Frem"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Log in"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkommen til Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Brug vedholdenhed?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nej"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Adgangsfrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrivebeskyttet?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Forkert adgangskode. PrÃ¸v venligst igen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Flere muligheder?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrationsadgangskode"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Indtast en administrationsadgangskode, hvis du har brug for at udfÃ¸re administrative opgaver.\nEllers vil det blive deaktiveret for at optimere sikkerheden."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Adgangskode:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificer adgangskode:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Adgangskoder er ikke ens</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adresse spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ved at Ã¦ndre MAC-adressen skjules netvÃ¦rksenhedens serienummer for det lokale netvÃ¦rk. Dette kan hjÃ¦lpe med at skjule din geografiske placering."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Det er generelt mere sikkert at Ã¦ndre MAC-adresser, men det kan potentielt ogsÃ¥ virke mistÃ¦nkeligt eller give problemer med forbindelsen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof alle MAC-adresser"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "NetvÃ¦rkskonfiguration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Denne computers internetforbindelse er fri for forhindringer. Du kan oprette forbindelse direkte til Tor-netvÃ¦rket."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Denne computers internetforbindelse er censureret, filtreret eller proxiet. Du skal konfigurere bro, firewall eller proxy indstillinger."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DeaktivÃ©r alt netvÃ¦rkskommunikation"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Sprog"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist fejlede med returkode %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup fejlede med return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist fejlede med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Anden..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/de/de.po b/de/de.po
index a81781f..70e3412 100644
--- a/de/de.po
+++ b/de/de.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -34,170 +34,290 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Weiter"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Anmelden"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Willkommen bei Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "BestÃ¤ndige Speicherpartition benutzen?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.de.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nein"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "SchreibgeschÃ¼tzt?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Falsche Passphrase. Bitte erneut versuchen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Weitere Optionen?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrationspasswort"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.de.html\">Dokumentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Geben Sie ein Administrationspasswort ein, falls Sie administrative Aufgaben durchfÃ¼hren wollen.\nAndernfalls wird diese Funktion zur ErhÃ¶hung der Sicherheit deaktiviert."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passwort:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Passwort erneut eingeben:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>PasswÃ¶rter stimmen nicht Ã¼berein</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Manipulation der MAC-Adresse"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte im lokalen Netzwerk verborgen werden. Dies     hilft dabei, Ihren geografischen Standort geheim zu halten."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Es ist grundsÃ¤tzlich sicherer, MAC-Adressen zu manipulieren, aber es kÃ¶nnte auch Verdacht erregen oder Netzwerkverbindungsprobleme verursachen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Alle MAC-Adressen manipulieren"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netzwerkeinstellungen"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Die Internet-Verbindung dieses Rechners ist frei von Hindernissen. Es kann sich direkt mit dem Tor-Netzwerk verbunden werden."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Die Internet-Verbindung dieses Rechners ist zensiert, gefiltert oder vermittelt. BrÃ¼cken-, Firewall- oder Vermittlungsserver-Einstellungen mÃ¼ssen getroffen werden."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Alle Netzwerkfunktionen deaktivieren"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Sprache"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ort"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Tastenbelegung"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ist mit Code %(returncode)s fehlgeschlagen:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Andere â?¦"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/dz/dz.po b/dz/dz.po
index 4dadf08..e667edd 100644
--- a/dz/dz.po
+++ b/dz/dz.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Dzongkha (http://www.transifex.com/otf/torproject/language/dz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/el/el.po b/el/el.po
index 56224c9..06b81c1 100644
--- a/el/el.po
+++ b/el/el.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-25 09:33+0000\n"
-"Last-Translator: anvo <fragos.george@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,170 +25,290 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Î?Î¼Ï?Ï?Ï?Ï?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Î?Î¯Ï?Î¿Î´Î¿Ï?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Î?Î±Î»Ï?Ï?Î®Ï?Î¸Î±Ï?Îµ Ï?Ï?Î¿ Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Î?Î½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· persistence;"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Î¤ÎµÎºÎ¼Î·Ï?Î¯Ï?Ï?Î·</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Î?Î±Î¹"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Î?Ï?Î¹"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Î£Ï?Î½Î¸Î·Î¼Î±Ï?Î¹ÎºÎ® Î¦Ï?Î¬Ï?Î·:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Î?Ï?Î½Î¿ Î³Î¹Î± Î?Î½Î¬Î³Î½Ï?Ï?Î·;"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Î?Î¬Î¸Î¿Ï? Ï?Ï?Î½Î¸Î·Î¼Î±Ï?Î¹ÎºÎ® Ï?Ï?Î¬Ï?Î·. Î Î±Ï?Î±ÎºÎ±Î»Ï? Î´Î¿ÎºÎ¹Î¼Î¬Ï?Ï?Îµ Î¾Î±Î½Î¬.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Î ÎµÏ?Î¹Ï?Ï?Ï?Ï?ÎµÏ?ÎµÏ? ÎµÏ?Î¹Î»Î¿Î³ÎÏ?;"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Î?Ï?Î´Î¹ÎºÏ?Ï? Î´Î¹Î±Ï?ÎµÎ¯Ï?Î¹Ï?Î·Ï?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Î¤ÎµÎºÎ¼Î·Ï?Î¯Ï?Ï?Î·</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Î?Î¹Ï?Î¬Î³ÎµÏ?Îµ ÎÎ½Î±Î½ ÎºÏ?Î´Î¹ÎºÏ? Î´Î¹Î±Ï?ÎµÎ¯Ï?Î¹Ï?Î·Ï? Ï?Îµ Ï?ÎµÏ?Î¯Ï?Ï?Ï?Ï?Î· Ï?Î¿Ï? Ï?Ï?ÎµÎ¹Î±Ï?Ï?ÎµÎ¯Ï?Îµ Î½Î± Ï?Ï?Î±Î³Î¼Î±Ï?Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Î´Î¹Î±Ï?ÎµÎ¹Ï?Î¹Ï?Ï?Î¹ÎºÎÏ? ÎµÏ?Î³Î±Ï?Î¯ÎµÏ?. \nÎ?Î¹Î´Î¬Î»Î»Ï?Ï? Î¸Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¸ÎµÎ¯ Î³Î¹Î± ÎºÎ±Î»Ï?Ï?ÎµÏ?Î· Î±Ï?Ï?Î¬Î»ÎµÎ¹Î±."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Î?Ï?Î´Î¹ÎºÏ?Ï?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Î?Ï?Î±Î»Î®Î¸ÎµÏ?Ï?Î· Î?Ï?Î´Î¹ÎºÎ¿Ï?:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Î?Î¹ ÎºÏ?Î´Î¹ÎºÎ¿Î¯ Î´ÎµÎ½ Ï?Î±Î¹Ï?Î¹Î¬Î¶Î¿Ï?Î½</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Î?Î»Î»Î¿Î¯Ï?Ï?Î· Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·Ï? MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Î¤ÎµÎºÎ¼Î·Ï?Î¯Ï?Ï?Î·</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Î? Ï?Î»Î±Ï?Ï?Î¿Î³Ï?Î¬Ï?Î·Ï?Î· Ï?Ï?Î½ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÏ?Î½ MAC ÎºÏ?Ï?Î²ÎµÎ¹ Ï?Î¿Î½ Ï?ÎµÎ¹Ï?Î¹Î±ÎºÏ? Î±Ï?Î¹Î¸Î¼Ï? Ï?Ï?Î½ ÎºÎ±Ï?Ï?Ï?Î½ Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î±Ï? Î³Î¹Î± Ï?Î± Ï?Î¿Ï?Î¹ÎºÎ¬ Î´Î¯ÎºÏ?Ï?Î±. Î?Ï?Ï?Ï? Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Ï?Î±Ï? Î²Î¿Î·Î¸Î®Ï?ÎµÎ¹ Î½Î± ÎºÏ?Ï?Ï?ÎµÏ?Îµ Ï?Î· Î³ÎµÏ?Î³Ï?Î±Ï?Î¹ÎºÎ® Î¸ÎÏ?Î· Ï?Î±Ï?."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Î?Î¯Î½Î±Î¹ Î³ÎµÎ½Î¹ÎºÎ¬ Î±Ï?Ï?Î±Î»ÎÏ?Ï?ÎµÏ?Î¿ Î½Î± Ï?Î»Î±Ï?Ï?Î¿Î³Ï?Î±Ï?Î®Ï?ÎµÏ?Îµ Ï?Î¹Ï? Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? MAC, Î±Î»Î»Î¬ Î±Ï?Ï?Ï? Î¸Î± Î¼Ï?Î¿Ï?Î¿Ï?Ï?Îµ ÎµÏ?Î¯Ï?Î·Ï? Î½Î± Î±Ï?Î¾Î®Ï?ÎµÎ¹ Ï?Î·Î½ Ï?Ï?Î¿Ï?Î¯Î± Î® Î½Î± Ï?Ï?Î¿ÎºÎ±Î»ÎÏ?ÎµÎ¹ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î± Ï?Ï?Î½Î´ÎµÏ?Î·Ï? Î¼Îµ Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Î Î»Î±Ï?Ï?Î¿Ï?Î¬Ï?Î·Ï?Î· Ï?Î»Ï?Î½ Ï?Ï?Î½ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÏ?Î½ MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Î¤ÎµÎºÎ¼Î·Ï?Î¯Ï?Ï?Î·</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Î? Ï?Ï?Î½Î´ÎµÏ?Î· Î´Î¹Î±Î´Î¹ÎºÏ?Ï?Î¿Ï? Î±Ï?Ï?Î¿Ï? Ï?Î¿Ï? Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î® Î´ÎµÎ½ Ï?Î±Ï?ÎµÎ¼Ï?Î¿Î´Î¯Î¶ÎµÏ?Î±Î¹. Î?Î± Î¸ÎÎ»Î±Ï?Îµ Î½Î± Ï?Ï?Î½Î´ÎµÎ¸ÎµÎ¯Ï?Îµ Î±Ï?' ÎµÏ?Î¸ÎµÎ¯Î±Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Î? Ï?Ï?Î½Î´ÎµÏ?Î· Î´Î¹Î±Î´Î¹ÎºÏ?Ï?Î¿Ï? Î±Ï?Ï?Î¿Ï? Ï?Î¿Ï? Ï?Ï?Î¿Î»Î¿Î³Î¹Ï?Ï?Î® Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÏ?Î±Î¹, Ï?Î¹Î»Ï?Ï?Î¬Ï?ÎµÏ?Î±Î¹ Î® Ï?ÎµÏ?Î½Î¬ÎµÎ¹ Î±Ï?Ï? proxy. Î Ï?ÎÏ?ÎµÎ¹ Î½Î± Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Îµ Ï?Î¹Ï? ÎµÏ?Î¹Î»Î¿Î³ÎÏ? Î³Î¹Î± Ï?Î¹Ï? Î³ÎÏ?Ï?Ï?ÎµÏ?, Ï?Î¿ firewall Î® Ï?Î¿ proxy. "
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?Ï?Îµ Ï?Î»Î± Ï?Î± Î´Î¯ÎºÏ?Ï?Î±"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Î?Î»Ï?Ï?Ï?Î±"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Î¤Î¿Ï?Î¿Î¸ÎµÏ?Î¯Î±"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Î?Î¹Î¬Ï?Î±Î¾Î·"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Î¤Î¿ live-persist Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Î¤Î¿ cryptsetup Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Î¤Î¿ live-persist Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Î?Î»Î»Î±..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index f9f0d1c..b2a96ad 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be 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."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verify Password:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing MAC addresses hides the serial number of your network cards to the local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "It is generally safer to spoof MAC addresses, but it might also raise suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "This computer's Internet connection is clear of obstacles. You would like to connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "This computer's Internet connection is censored, filtered, or proxied. You need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Disable all networking"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Other..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/eo/eo.po b/eo/eo.po
index 96bb033..4175406 100644
--- a/eo/eo.po
+++ b/eo/eo.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-01-23 16:59+0000\n"
-"Last-Translator: Arturo Crespo\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "AntaÅe"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ensaluti"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bonvenon al Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ä?u uzi permanente?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentado</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Pasvorto:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Nurlege?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Malbona pasvorto. Provu denove.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Pliaj agordoj?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrada pasvorto"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentado</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Entajpu administradan pasvorton se vi bezonos fari administradajn aferojn.\nAlikaze ili estos malpermesitaj pro pli bona sekureco."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Pasvorto:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Kontroli pasvorton:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>La pasvortoj malsamas</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adresa mistifikado"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentado</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mistifikado de MAC-adresoj kaÅ?as serionumeron de via retkarto por lokaj retoj. Tio povas helpi kaÅ?i vian geografian lokon."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ä?enerale estas pli sekure mistifiki MAC-adresojn, sed tio povas ankaÅ pligrandigi suspekton aÅ kaÅzi problemojn kun retkonekto."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Mistifiki Ä?iujn MAC-adresojn"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Reta agordo"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentado</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Interretkonekto de tiu Ä?i komputolo estas senbariera. Vi povas konekti direkte al la Tor-reto."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Interretkonekto de tiu Ä?i komputilo estas cenzurata, filtrata aÅ konektita per prokurilo. Vi bezonas agordi ponton, fajroÅ?irmilo aÅ agordoj por la prokurilo."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Malfunkciigi Ä?iuj retoj"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Lingvo"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lingvo"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "AranÄ?o"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist paneis revenante kodon %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup paneis revenante kodon %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist paneis revenante kodon %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Aliaj..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/es/es.po b/es/es.po
index 9467a80..a21fab2 100644
--- a/es/es.po
+++ b/es/es.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-02-09 08:59+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,170 +26,290 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adelante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Entrar"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenido a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Â¿Usar persistencia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.es.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "SÃ"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de contraseÃ±a:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Â¿SÃ³lo lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase de contraseÃ±a incorrecta. Por favor, intÃ©ntelo de nuevo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Â¿MÃ¡s opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ContraseÃ±a de administraciÃ³n"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.es.html\">DocumentaciÃ³n</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introduzca la contraseÃ±a de administraciÃ³n en caso de que necesite realizar tareas de administraciÃ³n. \nDe otro modo se deshabilitarÃ¡, para mayor seguridad."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ContraseÃ±a:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifique la contraseÃ±a: "
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Las contraseÃ±as no coinciden</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Falseamiento de la direcciÃ³n MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.es.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "El falseamiento de la direcciÃ³n MAC oculta el nÃºmero de serie de sus tarjetas de red a las redes locales. Esto puede ayudarle a ocultar su ubicaciÃ³n geogrÃ¡fica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalmente es mÃ¡s seguro simular una direcciÃ³n MAC, pero podrÃa tambiÃ©n aumentar las sospechas o causar problemas de conexiÃ³n a la red."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Falsear todas las direcciones MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraciÃ³n de red"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.es.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La conexiÃ³n a Internet de esta computadora estÃ¡ libre de obstÃ¡culos. Puede que quiera conectar directamente a la red Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La conexiÃ³n a Internet de esta computadora estÃ¡ censurada, filtrada, o proxyficada. TendrÃ¡ que configurar un repetidor puente ('bridge'), un  cortafuegos ('firewall'), o las configuraciones para proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desactivar todas las redes"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "LocalizaciÃ³n"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "DiseÃ±o"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist fallÃ³ devolviendo el cÃ³digo %(returncode)s: %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup fallÃ³ devolviendo el cÃ³digo %(returncode)s: \n%(stdout)s \n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist fallÃ³ devolviendo el cÃ³digo %(returncode)s: \n%(stdout)s \n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Otro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index cb00fd4..7c5e495 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Pablo Di Noto <pdinoto@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Reenviar"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar sesiÃ³n"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenido a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Â¿Habilitar persistencia de datos?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de contraseÃ±a:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Â¿Habilitar modo solo lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "Frase de contraseÃ±a incorrecta. Por favor intente nuevamente."
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mas opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ContraseÃ±a de administraciÃ³n"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DocumentaciÃ³n</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introduzca una contraseÃ±a de administraciÃ³n por si acaso necesita realizar alguna tarea administrativa.\nSi no lo hace, el usuario administrador serÃ¡ deshabilitado para mayor seguridad."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ContraseÃ±a:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar contraseÃ±a:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>La contraseÃ±a no concuerda</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ocultar la direcciÃ³n MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "La opciÃ³n de ocultar la direcciÃ³n MAC utiliza una direcciÃ³n alternativa para no revelar la direcciÃ³n de fÃ¡brica de sus adaptadores de red. Esto puede evitar revelar su ubicaciÃ³n geogrÃ¡fica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "En general, es mÃ¡s seguro ocultar sus direcciones MAC, pero es posible que despierte sospechas o cause problemas de conexiÃ³n en la red."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ocultar todas las direcciones MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraciÃ³n de red"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Este computador esta conectado a Internet sin obstÃ¡culos QuizÃ¡s quiera directamente a la red Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Este computador esta conectado a Internet utilizando un servicio que esta censurado, tiene filtros o un servidor proxy. Debe configurar un bridge, cortafuegos o proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Deshabilitar toda forma de conexiÃ³n a redes"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ubicacion"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "DistribuciÃ³n"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ha fallado con cÃ³digo de error %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ha fallado con cÃ³digo de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ha fallado con cÃ³digo de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Otro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/es_CL/es_CL.po b/es_CL/es_CL.po
index 6cba5f5..9a3500a 100644
--- a/es_CL/es_CL.po
+++ b/es_CL/es_CL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/otf/torproject/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adelantar"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/es_CO/es_CO.po b/es_CO/es_CO.po
index 1c84d5a..3cc1a7c 100644
--- a/es_CO/es_CO.po
+++ b/es_CO/es_CO.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/otf/torproject/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Hacia adelante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar sesion"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po
index e68687a..ab242ea 100644
--- a/es_MX/es_MX.po
+++ b/es_MX/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adelante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar SesiÃ³n"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenido a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utilizar Persistencia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Palabra clave:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Solo Lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Palabra clave incorrecta. Por favor intenta de nuevo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Â¿Mas opciones?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Password de Administrador"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DocumentaciÃ³n</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ingrese una contraseÃ±a de administrador en caso de que necesites realizar tareas de administrador.\nEn caso contrario serÃ¡ desactivado por motivos de seguridad."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ContraseÃ±a:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar ContraseÃ±a:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Las contraseÃ±as no coinciden</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing MAC addresses oculta el numero de serie de tu tarjeta e red dentro de la red local. Esto te ayuda a ocultar tu ubicaciÃ³n geogrÃ¡fica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalmente es mas seguro el Spoof MAC addresses, pero tambiÃ©n podrÃa levantar sospechas o causar problemas de conexiÃ³n de la red."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Husmear en todas las MAC addesses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraciÃ³n de red"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La conexiÃ³n a internet de esta computadora estÃ¡ libre de obstÃ¡culos. Â¿Deseas conectarte directamente a la red de Tor?"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La conexiÃ³n a intetnet de esta computadora estÃ¡ censurada, filtrada o pasa a travÃ©s de un proxy. Es necesario configurar los ajustes del puente, cortafuegos o proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desactivar toda actividad."
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "."
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Lenguaje"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lugar"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "DiseÃ±o"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist fallÃ³ regresando codigo de error %(returncode)s:%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup fallÃ³ regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist fallÃ³ regresando codigo de error %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Otro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/et/et.po b/et/et.po
index f207cb5..ed32bb7 100644
--- a/et/et.po
+++ b/et/et.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jah"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/eu/eu.po b/eu/eu.po
index 6adf6aa..bdf8b67 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-30 17:26+0000\n"
-"Last-Translator: Iban\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Aurrera"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Saioa hasi"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ongi etorri Tailsera"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Iraunkortasuna erabili?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.eu.html\">Dokumentazioa</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Bai"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ez"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Pasahitza:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Irakurketa bakarrik?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Pasahitz okerra. Mesedez saiatu berriz</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Aukera gehiago?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Kudeaketa pasahitza"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentazioa</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Sartu kudeaketa pasahitza kudeaketa zereginak egin behar badituzu.\nBestela ezgaitu egingo da segurtasuna hobetzeko."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Pasahitza:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Pasahitza egiaztatu"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Pasahitzek ez dute bat egiten</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC helbidearen spoofing-a"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.eu.html\">Dokumentazioa</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC helbidea aldatzeak sare lokalan zure sare-txartelaren serie-zenbakia ezkutatzen du. Honek zure kokapen geografikoa eskutatzen lagundu diezazuke."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Oro har seguruagoa da MAC helbideak simulatzea, baina horrek ere susmoak eragin eta konexio arazoak sor ditzake sarearekin."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Faltsutu MAC helbide guztiak"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Sarearen konfigurazioa"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentazioa</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ordenagailu honen Internet-konexioa ez du oztoporik. Tor sarera zuzenean konektatzea gustatuko litzaizuke."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Ordenagailu honen Interneteko konexioa zentsuratuta, iragazita, edo proxyatuta dago."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ezgaitu konexio guztiak"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Hizkuntza"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokala"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Diseinua"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist huts egin du %(returncode)s kodeekin:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup huts egin du %(returncode)s kodeekin:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist huts egin du %(returncode)s kodeekin:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Beste bat..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fa/fa.po b/fa/fa.po
index f2d59dd..a0f65c0 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-05-19 07:12+0000\n"
-"Last-Translator: Amir Moezzi <amirreza.mz@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,170 +25,290 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ø¨Ù? Ø³Ù?Øª Ø¬Ù?Ù?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ù?Ø±Ù?Ø¯"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ø¨Ù? Â«ØªÙ?Ù?Ø²Â» Ø®Ù?Ø´ Ø¢Ù?Ø¯Ù?Ø¯"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ø§Ø±ØªØ¨Ø§Ø· Ù¾Ø§Û?Ø§Ø?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ù?Ø³ØªÙ?Ø¯Ø§Øª</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ø¨Ù?Ù?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ù?Ù?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ø±Ù?Ø²"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Ù?Ù?Ø· Ø®Ù?Ø§Ù?Ø¯Ù?Ø?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Ø±Ù?Ø² Ø¯Ø±Ø³Øª Ù?Û?Ø³Øª. Ù?Ø·Ù?Ø§Ù? Ø¯Ù?Ø¨Ø§Ø±Ù? Ø³Ø¹Û?â??Ú©Ù?Û?Ø¯.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ú¯Ø²Û?Ù?Ù?â??Ù?Ø§Û? Ø¨Û?Ø´ØªØ±Ø?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ø±Ù?Ø² Ù?Ø¯Ù?Ø±Ù?Øª"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ù?Ø³ØªÙ?Ø¯Ø§Øª</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ø¯Ø± ØµÙ?Ø±ØªÛ? Ú©Ù? Ù?Û?â??Ø®Ù?Ø§Ù?Û?Ø¯ Ú©Ø§Ø±Ù?Ø§Û? Ù?Ø¯Û?Ø±Û?ØªÛ? Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Û?Ø¯Ø? Ú©Ù?Ù?Ù?Ù? Ø¹Ø¨Ù?Ø± Ù?Ø¯Û?Ø±Û?Øª Ø±Ø§ Ù?Ø§Ø±Ø¯ Ù?Ù?Ø§Û?Û?Ø¯.\nÙ?Ú¯Ø±Ù?Ù?Ø? Ø§Ù?Ù? Ú¯Ø²Ù?Ù?Ù? Ø¨Ø±Ø§Ù? Ø§Ù?Ù?Ù?Øª Ø¨Ù?Ø´ØªØ± ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ù?Ù?â??Ø´Ù?Ø¯."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ø±Ù?Ø² Ø¹Ø¨Ù?Ø±:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ØªØ§Ù?Ù?Ø¯  Ø±Ù?Ø²"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Ø±Ù?Ø²Ù?Ø§ Ø¨Ø§ Ù?Ù? Ù?Ø·Ø§Ø¨Ù?Øª Ù?Ø¯Ø§Ø±Ù?Ø¯</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ø¬Ø¹Ù? Ø¢Ø¯Ø±Ø³ MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ù?Ø³ØªÙ?Ø¯Ø§Øª</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ø¬Ø¹Ù? Ú©Ø±Ø¯Ù? Ø¢Ø¯Ø±Ø³ Ù?Ú©Ø? Ø´Ù?Ø§Ø±Ù? Ø³Ø±Û?Ø§Ù? Ú©Ø§Ø±Øª Ø´Ø¨Ú©Ù? Ø´Ù?Ø§ Ø±Ø§ Ø¯Ø± Ø´Ø¨Ú©Ù? Ù?Ø®Ù?Û? Ù?Û? Ú©Ù?Ø¯. Ø¨Ù? Ø§Û?Ù? ØªØ±ØªÛ?Ø¨ Ù?Û? ØªÙ?Ø§Ù?Û?Ø¯ Ù?Ù?Ù?Ø¹Û?Øª Ø¬ØºØ±Ø§Ù?Û?Ø§Û?Û? Ø®Ù?Ø¯ Ø±Ø§ Ù¾Ù?Ù?Ø§Ù? Ú©Ù?Û?Ø¯."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ø¨Ù?â??Ø·Ù?Ø± Ú©Ù?Û? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø²Ù?Ø§Ø¨Ù?Û?Øª MAC Spoofing Ø§Ù?Ù?â??ØªØ± Ø§Ø³Øª Ø§Ù?Ø§ Ø§Û?Ù? Ø§Ù?Ú©Ø§Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ù?Ø´Ú©Ù?Ú© ØªÙ?Ù?Û? Ø´Ù?Ø¯ Ù? Û?Ø§ Ø¨Ø§Ø¹Ø« Ø§Û?Ø¬Ø§Ø¯ Ù?Ø´Ú©Ù? Ø¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ú¯Ø±Ø¯Ø¯."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ù?Ù?Ù? Ø¢Ø¯Ø±Ø³â??Ù?Ø§Û? MAC Ø±Ø§ Ø¬Ø¹Ù? Ú©Ù?"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø´Ø¨Ú©Ù?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ù?Ø³ØªÙ?Ø¯Ø§Øª</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ø§ØªØµØ§Ù? Ø§Û?Ù?ØªØ±Ù?Øª Ø§Û?Ù? Ø±Ø§Û?Ø§Ù?Ù? Ø¨Ø¯Ù?Ù? Ù?Ø§Ù?Ø¹ Ø§Ø³Øª. Ø¢Û?Ø§ Ù?Ø§Û?Ù?Û?Ø¯ Ù?Ø³ØªÙ?Û?Ù? Ø¨Ù? Ø´Ø¨Ú©Ù? ØªÙ?Ø± Ù?ØªØµÙ? Ø´Ù?Û?Ø¯Ø?"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù?Ù?Ù? Ø´Ø¨Ú©Ù? Ù?Ø§"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "â??"
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Ø²Ø¨Ø§Ù?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ù?ØÙ?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ØµÙ?ØÙ?â??Ø¨Ù?Ø¯Ù?"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist Ù?Ø§Ù?Ù?Ù?Ù? Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø®Ø·Ø§Û? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup Ù?Ø§Ù?Ù?Ù?Ù? Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø®Ø·Ø§Û? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist Ù?Ø§Ù?Ù?Ù?Ù? Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø®Ø·Ø§Û? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Ø¯Û?Ú¯Ø±..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fi/fi.po b/fi/fi.po
index 851f032..bfe31fa 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Jaakko Helleranta <jaakko@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "EteenpÃ¤in"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Kirjaudu"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tervetuloa kÃ¤yttÃ¤mÃ¤Ã¤n Tailsia"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "SÃ¤ilytÃ¤ muutokset?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ohjeet</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "KyllÃ¤"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Salalause:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Vain lukuoikeus?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>VÃ¤Ã¤rÃ¤ salalause. YritÃ¤ uudelleen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "EnemmÃ¤n asetuksia?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "YllÃ¤pidon salasana"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ohjeet</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Valitse yllÃ¤pidon salasana siltÃ¤ varalta, ettÃ¤ joudut tekemÃ¤Ã¤n yllÃ¤pidollisia toimenpiteitÃ¤.\nMuutoin yllÃ¤pito estetÃ¤Ã¤n turvallisuussyistÃ¤."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Salasana:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Varmista salasana:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Salasanat eivÃ¤t tÃ¤smÃ¤Ã¤</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-osoitteen vÃ¤Ã¤rentÃ¤minen"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ohjeet</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "VÃ¤Ã¤rennetty MAC-osoite piilottaa verkkokorttisi sarjanumeron. VÃ¤Ã¤rentÃ¤minen helpottaa maantieteellisen sijainnin piilottamista."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "MAC-osoitteen vÃ¤Ã¤rentÃ¤minen on yleensÃ¤ turvallisempaa, mutta vÃ¤Ã¤rennetty osoite voi herÃ¤ttÃ¤Ã¤ huomiota tai aiheuttaa ongelmia verkkoyhteydessÃ¤."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "VÃ¤Ã¤rennÃ¤ kaikki MAC-osoitteet"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Verkon asetukset"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ohjeet</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Tietokoneen Internet-yhteydessÃ¤ ei ole esteitÃ¤. Voit yhdistÃ¤Ã¤ suoraan Tor-verkkoon."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Tietokoneen Internet-yhteyttÃ¤ sensuroidaan, suodatetaan tai kÃ¤ytetÃ¤Ã¤n vÃ¤lityspalvelimen kautta. Sinun tÃ¤ytyy mÃ¤Ã¤rittÃ¤Ã¤ silta-, palomuuri- ja vÃ¤lityspalvelinasetukset."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Poista kaikki verkkoyhteydet kÃ¤ytÃ¶stÃ¤"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Kieli"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Maa-asetus"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "NÃ¤ppÃ¤inasettelu"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist epÃ¤onnistui paluuarvolla %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup epÃ¤onnistui paluuarvolla %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist epÃ¤onnistui paluuarvolla %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Muu..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fil/fil.po b/fil/fil.po
index c3c0a7a..8fbd2bd 100644
--- a/fil/fil.po
+++ b/fil/fil.po
@@ -8,180 +8,300 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Filipino (http://www.transifex.com/otf/torproject/language/fil/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fil\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n==2 || n==3) || (n % 10 != 4 || n % 10 != 6 || n % 10 != 9);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Sulong"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Maligayang pagsalubong sa Tails! "
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Gumamit ng persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
+
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oo"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Wala"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/fo/fo.po b/fo/fo.po
index e7a962f..b2b7a05 100644
--- a/fo/fo.po
+++ b/fo/fo.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Faroese (http://www.transifex.com/otf/torproject/language/fo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: fo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/fr/fr.po b/fr/fr.po
index 016f320..7ae615b 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -6,7 +6,7 @@
 # Alex <chioubaca@xxxxxxxxx>, 2014
 # apaddlingduck, 2014
 # Emmanuel Simond <emmanuel.simond@xxxxxxxxx>, 2014
-# French language coordinator <french.translation@xxxxxxx>, 2016-2017
+# French language coordinator <french.coordinator@xxxxxxx>, 2016-2017
 # matsa <matsa@xxxxxxxxxx>, 2013
 # Onizuka, 2013
 # Sabrina Cater <sabcat@xxxxxx>, 2015
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-03-30 22:19+0000\n"
-"Last-Translator: French language coordinator <french.translation@xxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,170 +26,290 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avancer"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Connexion"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenue dans Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utiliser la persistance ?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oui"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Phrase de passe :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Lecture-seule ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>La phrase de passe est erronÃ©e. Veuillez ressayer.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Plus d'options ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Mot de passe d'administration"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation (en anglais)</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Saisissez un mot de passe d'administration au cas oÃ¹ vous auriez besoin d'accomplir des tÃ¢ches d'administration.\nAutrement, il sera dÃ©sactivÃ© pour une sÃ©curitÃ© accrue."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "VÃ©rifier le mot de passe :"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Les mots de passe ne concordent pas</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "DÃ©guisement de l'adresse MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Le dÃ©guisement de l'adresse MAC dissimule le numÃ©ro de sÃ©rie de vos cartes rÃ©seau aux rÃ©seaux locaux. Cela peut vous aider Ã  dissimuler votre position gÃ©ographique."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Il est gÃ©nÃ©ralement plus sÃ»r de dÃ©guiser les adresses MAC, mais cela peut aussi Ã©veiller des soupÃ§ons ou causer des problÃ¨mes de connexion rÃ©seau."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "DÃ©guiser toutes les adresses MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuration du rÃ©seau"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connexion Internet de cet ordinateur est sans obstacle. Vous pouvez vous connecter directement au rÃ©seau Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connexion rÃ©seau de cet ordinateur est censurÃ©e, filtrÃ©e ou relayÃ©e par un serveur mandataire. Vous devez configurer les paramÃ¨tres de ponts (Bridges), pare-feu ou serveur mandataire."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DÃ©sactiver la connectivitÃ© rÃ©seau"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Langue"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ParamÃ¨tres de langue"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposition"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Ã?chec de live-persist avec le code de retour %(returncode)s :\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Ã©chec de cryptsetup avec le code de retour %(returncode)sÂ :\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Ã?chec de live-persist avec le code de retour %(returncode)s :\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Autre..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po
index a316046..a2d2490 100644
--- a/fr_CA/fr_CA.po
+++ b/fr_CA/fr_CA.po
@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# French language coordinator <french.translation@xxxxxxx>, 2016
+# French language coordinator <french.coordinator@xxxxxxx>, 2016
 # matsa <matsa@xxxxxxxxxx>, 2013
 # Onizuka, 2013
-# French language coordinator <french.translation@xxxxxxx>, 2015-2016
-# French language coordinator <french.translation@xxxxxxx>, 2014
+# French language coordinator <french.coordinator@xxxxxxx>, 2015-2016
+# French language coordinator <french.coordinator@xxxxxxx>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-16 16:08+0000\n"
-"Last-Translator: French language coordinator <french.translation@xxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avancer"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Connexion"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenue Ã  Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utiliser la persistance?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oui"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Phrase de passe :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Lecture-seule?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>La phrase de passe est erronÃ©e. Veuillez ressayer.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Plus d'options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Mot de passe d'administration"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation (en anglais)</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Saisissez un mot de passe d'administration au cas oÃ¹ vous auriez besoin d'accomplir des tÃ¢ches d'administration.\nAutrement, il sera dÃ©sactivÃ© pour une sÃ©curitÃ© accrue."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "VÃ©rifier le mot de passe :"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Les mots de passe ne correspondent pas</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "DÃ©guisement de l'adresse MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Le dÃ©guisement de l'adresse MAC dissimule le numÃ©ro de sÃ©rie de vos cartes rÃ©seau aux rÃ©seaux locaux. Cela peut vous aider Ã  dissimuler votre position gÃ©ographique."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Il est gÃ©nÃ©ralement plus sÃ©curitaire de dÃ©guiser les adresses MAC, mais cela peut aussi Ã©veiller des soupÃ§ons ou causer des problÃ¨mes de connexion rÃ©seau."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "DÃ©guiser toutes les adresses MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuration du rÃ©seau"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connexion Internet de cet ordinateur est sans obstacle. Vous pouvez vous connecter directement au rÃ©seau Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connexion rÃ©seau de cet ordinateur est censurÃ©e, filtrÃ©e ou relayÃ©e par un serveur mandataire. Vous devez configurer les paramÃ¨tres de pont, pare-feu ou serveur mandataire."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DÃ©sactiver la connectivitÃ© rÃ©seau"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Langue"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ParamÃ¨tres de langue"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposition"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "Ã?chec de live-persist avec le code de retour %(returncode)sÂ :\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Ã©chec de cryptsetup avec le code de retour %(returncode)sÂ :\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Ã?chec de live-persist avec le code de retour %(returncode)sÂ :\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Autre..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/fur/fur.po b/fur/fur.po
index 2e5461c..ff57c66 100644
--- a/fur/fur.po
+++ b/fur/fur.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Friulian (http://www.transifex.com/otf/torproject/language/fur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: fur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/fy/fy.po b/fy/fy.po
index f0eb552..eeaeffa 100644
--- a/fy/fy.po
+++ b/fy/fy.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: fy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumintaasje</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Wachtwurd:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumintaasje</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Wachtwurd:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "Dokumintaasje"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "Dokumintaasje"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Taal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ga/ga.po b/ga/ga.po
index 97131d9..bc50ae6 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ga\n"
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/gd/gd.po b/gd/gd.po
index 4ca3f22..40ba6fb 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2012-10-03 17:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: gd\n"
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Chan eil"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/gl/gl.po b/gl/gl.po
index ad6e132..ff132b7 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Xan VFR\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Adiante"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Acceso"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Benvido/a a Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usar persistencia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de paso:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "SÃ³ lectura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Contrasinal incorrecto. Tenteo de novo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "MÃ¡is opciÃ³ns?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Contrasinal de administraciÃ³n"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DocumentaciÃ³n</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introduza un contrasinal de administraciÃ³n para cando teÃ±a que realizar tarefas de administraciÃ³n.\nDe non facelo, para maior seguridade, desactivarase."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contrasinal:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar o contrasinal:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Os contrasinais non coinciden</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Spoofing de direcciÃ³n MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Facendo spoofing da direcciÃ³n MAC oculta o nÃºmero de serie das sÃºas tarxetas de rede Ã¡s redes locales. Isto pode axudar a ocultar a sÃºa localizaciÃ³n xeogrÃ¡fica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Xeralmente Ã© mÃ¡is seguro facer spoofing das direcciÃ³ns MAC, pero tamÃ©n pode levantar sospeitas ou causar problemas de conexiÃ³n Ã¡ rede."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Facer spoofing de tÃ³dalas direcciÃ³ns MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraciÃ³n de rede"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaciÃ³n</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A conexiÃ³n Ã¡ Internet deste computador estÃ¡ libre de obstÃ¡culos. PrestarÃalle conectarse directamente Ã¡ rede Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A conexiÃ³n Ã¡ Internet deste computador estÃ¡ censurada, filtrada ou pasa por un proxy. Necesita configurar os axustes de ponte, cortalumes ou proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Deshabilitar toda conexiÃ³n Ã¡ rede"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "DeseÃ±o"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "produciuse un fallo coa persistencia en vivo devolvendo o cÃ³digo %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "produciuse un fallo na configuraciÃ³n de cifrado (cryptsetup) devolvendo o cÃ³digo %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "produciuse un fallo coa persistencia en vivo devolvendo o cÃ³digo %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Outro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/gu/gu.po b/gu/gu.po
index d9d180e..2193755 100644
--- a/gu/gu.po
+++ b/gu/gu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "àª?àª?àª³"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/gu_IN/gu_IN.po b/gu_IN/gu_IN.po
index dc2ab04..ee1d3a0 100644
--- a/gu_IN/gu_IN.po
+++ b/gu_IN/gu_IN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gujarati (India) (http://www.transifex.com/otf/torproject/language/gu_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: gu_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/gun/gun.po b/gun/gun.po
index 10c19ea..b99f192 100644
--- a/gun/gun.po
+++ b/gun/gun.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gun (http://www.transifex.com/otf/torproject/language/gun/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: gun\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ha/ha.po b/ha/ha.po
index 41ea624..f92560c 100644
--- a/ha/ha.po
+++ b/ha/ha.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hausa (http://www.transifex.com/otf/torproject/language/ha/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ha\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/he/he.po b/he/he.po
index ada8c5d..93ca8f6 100644
--- a/he/he.po
+++ b/he/he.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: ION <bobiganush@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,170 +25,290 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "×§×?×?×?×?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "×?× ×?×¡×? ×?×?×¢×¨×?×ª"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "×?×¨×?×? ×?×?×?×? ×?×? Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "×?×©×ª×?×© ×?×¢×§×©× ×?×ª?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">×ª×?×¢×?×?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "×?×?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "×?×?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "×?×?×?×¨×ª ×¡×?×¡×?×?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "×?×§×¨×?×?×? ×?×?×?×??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>×?×?×?×¨×ª ×¡×?×¡×?×? ×©×?×?×?×?×?. ×?× ×? × ×¡×? ×©×?×?</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "×?×?×ª×¨ ×?×¤×©×¨×?×?×?×ª?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "×¡×?×¡×?×ª ×?× ×?×?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">×ª×?×¢×?×?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "×?×?×? ×?×ª ×¡×?×¡×?×? ×©×? ×?×?×©×? ×?×?×§×¨×? ×©×?×ª×? ×¦×¨×?×?×?×? ×?×?×¦×¢ ×?×©×?×?×?×ª × ×?×?×?×?.\n ×?×?×¨×ª ×?×? ×?×?×?×? ×?×?×©×?×ª ×?×?×?×?×?×? ×?×?×?×? ×?×?×ª×¨."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "×¡×?×¡×?×?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "×?×?×?×?×ª ×¡×?×¡×?×?:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>×¡×?×¡×?×?×?×ª ×?×?× ×? ×ª×?×?×?×?×ª</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "×?×?×?×£ ×?×ª×?×?×?×ª Mac"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">×ª×?×¢×?×?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "×?×©×?×?×© ×?×ª×?×?×?×ª MAC ×?×¡×?×?×? ×?×ª ×?×?×¡×¤×¨ ×?×¡×?×?×?×¨×? ×©×? ×?×¨×?×?×¡ ×?×¨×©×ª ×©×?×? ×?×¢×?× ×? ×?×¨×©×ª×?×ª ×?×?×§×?×?×?×?×ª ×?×?×?×?×? ×?×?×? ×?×ª×?×?×¨. ×?×?×¨ ×?×? ×¢×©×?×? ×?×¡×?×?×¢ ×?×?×?×? ×?×?×¡×ª×?×¨ ×?×ª ×?×?×§×?×?×? ×?×?×?×?×?×?×¨×¤×?."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "×?×?×?×?, ×?×?×?×?×¥ ×?×?×©×?×© ×?×ª ×?×ª×?×?×ª ×?-MAC ×©×?×?, ×?×? ×?×? ×?×? ×¢×?×?×? ×?×¢×?×¨×¨ ×?×©×? ×?×? ×?×©×?×© ×?×ª ×?×?×?×?×?×¨ ×?×?×?× ×?×¨× ×?."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "×?×?×?×£ ×?×ª ×?×? ×?×ª×?×?×?×ª ×?-Mac"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "×ª×¦×?×¨×ª ×¨×©×ª"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">×ª×?×¢×?×?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×? ×?×?×©×? ×?×? ×¤× ×?×? ×?×?×?×©×?×?×?×?, ×?×¡× × ×?×? ×?×?×¡×?×?×?×ª. ×?×¨×¦×?× ×? ×?× ×¡×?×ª ×?×?×ª×?×?×¨ ×?×?×?× ×?×¨× ×? ×?×©×?×¨×?×ª ×?×?×?×¦×¢×?×ª ×¨×©×ª Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "×?×©×?×ª ×?×ª ×?×? ×?×?×ª×?×?×¨×?×?×?×ª ×?×¨×©×ª"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "×©×¤×?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "×?×?×?×¨"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "×?×¢×¨×?"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "×?×¤×¢×?×? ×?×?×? ×¢×§×?×?×ª × ×?×©×?×? ×¢×? ×?×©×?×?×?×? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup × ×?×©×? ×¢×? ×?×?×?×¢×ª ×?×©×?×?×?×?: %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "×?×¤×¢×?×? ×?×?×? ×¢×§×?×?×ª × ×?×©×?×? ×¢×? ×?×©×?×?×?×?: %(returncode)s:\n%(stdout)s \n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "×?×?×¨..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/hi/hi.po b/hi/hi.po
index 678cbaf..c7c4f20 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à¤?à¤?à¥?à¤°à¥?à¤·à¤¿à¤¤"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "à¤²à¥?à¤? à¤?à¤¨ "
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à¤¹à¤¾à¤?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à¤¨à¤¹à¥?à¤?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "à¤à¤¾à¤·à¤¾"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/hr/hr.po b/hr/hr.po
index 2434fd4..948d248 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprijed"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijavi se"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ViÅ¡e opcija?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrativna lozinka"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administrativnu lozinku u sluÄ?aju da trebate obaviti administrativne zadatke. InaÄ?e Ä?e biti onemoguÄ?ena radi bolje sigurnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdi lozinku"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Lozinke se ne poklapaju</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 59c07fc..de73b4b 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-24 14:26+0200\n"
-"PO-Revision-Date: 2016-08-29 12:33+0000\n"
-"Last-Translator: Igor <lyricaltumor@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
 "Language: hr_HR\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprijed"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "DobrodoÅ¡li u Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Koristiti ustrajnost?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo Ä?itanje?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>PogreÅ¡na lozinka. Molimo pokuÅ¡ajte ponovno.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ViÅ¡e moguÄ?nosti?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratorska lozinka"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administratorsku lozinku za sluÄ?aj da trebate izvoditi administratorske zadaÄ?e. One Ä?e u suprotnom biti onemoguÄ?ene radi bolje sigurnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdite lozinku:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Lozinke se ne podudaraju</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Maskiranje MAC adrese"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Maskiranje MAC adresa krije serijski broj VaÅ¡ih mreÅ¾nih kartica od lokalnih mreÅ¾a. Ovo Vam moÅ¾e pomoÄ?i sakriti VaÅ¡ zemljopisni poloÅ¾aj."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "OpÄ?enito je sigurnije maskirati MAC adrese, ali to bi takoÄ?er moglo izazvati sumnju ili prouzroÄ?iti probleme mreÅ¾ne veze."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Maskiraj sve MAC adrese"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Postavljanje mreÅ¾e"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internet veza ovoga raÄ?unala nema prepreka. Najbolje bi bilo spojiti se izravno u Tor mreÅ¾u."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internet veza ovoga raÄ?unala je cenzurirana, filtrirana ili koristi proxy. Trebate podesiti mostovne, vatrozidne ili proxy postavke."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "OnemoguÄ?i sav mreÅ¾ni rad"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Mjesto"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Raspored"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist nije uspio s povratnim kÃ´dom %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nije uspio s povratnim kÃ´dom %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nije uspio s povratnim kÃ´dom %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostaloâ?¦"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ht/ht.po b/ht/ht.po
index e6f3733..ed7fa1c 100644
--- a/ht/ht.po
+++ b/ht/ht.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Haitian (Haitian Creole) (http://www.transifex.com/otf/torproject/language/ht/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ht\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/hu/hu.po b/hu/hu.po
index 7ab0a80..188770f 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -5,7 +5,7 @@
 # Translators:
 # benewfy <benewfy@xxxxxxxxx>, 2015
 # Ferenc sati <s.feri33@xxxxxxxxx>, 2015
-# Blackywantscookies <gaborcika@xxxxxxxxxxxx>, 2014
+# Blackywantscookies, 2014
 # Lajos Pasztor <mrlajos@xxxxxxxxx>, 2014
 # vargaviktor <viktor.varga@xxxxxxxxx>, 2013
 # vargaviktor <viktor.varga@xxxxxxxxx>, 2012
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ElÅ?re"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "BelÃ©pÃ©s"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "KÃ¶szÃ¶ntjÃ¼k a Tails-ben"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Perzisztencia hasznÃ¡lata?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DokumentÃ¡ciÃ³</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Igen"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nem"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "JelszÃ³:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Csak olvashatÃ³?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>HibÃ¡s jelszÃ³. PrÃ³bÃ¡lja meg Ãºjra.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "TovÃ¡bbi beÃ¡llÃtÃ¡sok?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "AdminisztrÃ¡tori jelszÃ³"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DokumentÃ¡ciÃ³</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Adjon meg egy adminisztrÃ¡tori jelszÃ³t az adminisztrÃ¡ciÃ³s feladatokhoz.\n\nEgyÃ©bkÃ©nt kikapcsolt, a magasabb biztonsÃ¡g Ã©rdekÃ©ben."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "JelszÃ³:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "JelszÃ³ ellenÅ?rzÃ©se:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>A jelszavak nem egyeznek</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC cÃm elrejtÃ©se"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DokumentÃ¡ciÃ³</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC cÃm spoofing elrejti a hÃ¡lÃ³zati kÃ¡rtyÃ¡d szÃ©ria szÃ¡mÃ¡t a helyi hÃ¡lÃ³zaton. Ez segÃt elrejteni a fÃ¶ldrajzi helyzeted."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ã?ltalÃ¡ban biztonsÃ¡gos elrejteni a MAC cÃmet de ez gyanÃºt kelthet vagy hÃ¡lÃ³zati kapcsolati problÃ©mÃ¡kat okozhat."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ã?sszes MAC cÃm elrejtÃ©se"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "HÃ¡lÃ³zati konfigurÃ¡ciÃ³"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DokumentÃ¡ciÃ³</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A szÃ¡mÃtÃ³gÃ©p internet kapcsolata akadÃ¡lyoktÃ³l mentes. SzeretnÃ©l kÃ¶zvetlenÃ¼l kapcsolÃ³dni a Tor hÃ¡lÃ³zathoz."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A szÃ¡mÃtÃ³gÃ©p internet kapcsolata cenzÃºrÃ¡zott, szÅ±rt vagy proxy-t hasznÃ¡l. konfigurÃ¡lnod kell a bridge, tÅ±zfal vagy proxy beÃ¡llÃtÃ¡sokat."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ã?sszes hÃ¡lÃ³zatÃ©pÃtÃ©s letiltÃ¡sa"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Nyelv"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "OrszÃ¡g"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "KiosztÃ¡s"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist sikertelen a kÃ¶vetkezÅ? visszatÃ©rÃ©si kÃ³ddal: %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup sikertelen a kÃ¶vetkezÅ? visszatÃ©rÃ©si kÃ³ddal:  %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist sikertelen a kÃ¶vetkezÅ? visszatÃ©rÃ©si kÃ³ddal:  %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "EgyÃ©b..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/hy/hy.po b/hy/hy.po
index 813976d..d05c774 100644
--- a/hy/hy.po
+++ b/hy/hy.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ia/ia.po b/ia/ia.po
index 278a330..8df45ae 100644
--- a/ia/ia.po
+++ b/ia/ia.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Si"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Contrasigno:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Linguage"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/id/id.po b/id/id.po
index b7c19b5..e553eb5 100644
--- a/id/id.po
+++ b/id/id.po
@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# adhisuryo <adhisuryo@xxxxxxxxx>, 2015
+# adhisuryo i <adhisuryo@xxxxxxxxx>, 2015
 # Iwan Setiawan <stwn@xxxxxxxxxxxxx>, 2013
 # Marg Situ <margyouversion@xxxxxxxxx>, 2014
-# Mohamad Hasan Al Banna <se7entime@xxxxxxxxxxxxxx>, 2013
+# Mohamad Hasan Al Banna <se7entime@xxxxxxxxxxxxxxx>, 2013
 # km242saya <pencurimangga@xxxxxxxxx>, 2014
-# zk <zamani.karmana@xxxxxxxxx>, 2015
+# zk, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Lanjutkan"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Masuk"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Selamat datang di Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Gunakan persistensi?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasi</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ya"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Tidak"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frasa sandi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Hanya-Baca?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frasa sandi salah. Mohon coba lagi.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Opsi lainnya?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Sandi administrasi"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentasi</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Masukkan sandi administrasi Anda jika Anda perlu menjalankan tugas administrasi.\nSelain itu akan dinonfungsikan untuk keamanan yang lebih baik."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Sandi:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifikasi Sandi:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Sandi tidak sama</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Pemalsuan alamat MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentasi</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Memalsukan alamat MAC menyembunyikan nomor serial kartu jaringan Anda ke jaringan lokal. Ini dapat membantu menyembunyikan lokasi geografis Anda."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Akan lebih aman untuk men-spoof alamat MAC, tapi hal ini dapat meningkatkan kecurigaan atau akan menjadi masalah pada sambungan jaringan."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof semua alamat MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurasi jaringan"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentasi</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Hubungan internet komputer ini bebas halangan.  Anda dapat langsung berhubungan dengan jaringan Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Koneksi kekomputer ini tersensor, tersaring atau terproxy. anda perlu mengatur pengaturan bridge, firewall, atau pengaturan proxy"
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Nonaktifkan semua jaringan"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Bahasa"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Tata Letak"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "Konfigrasi Crypt gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist gagal dengan kode sebagai berikut %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Lainnya..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/is/is.po b/is/is.po
index 470655a..755afa5 100644
--- a/is/is.po
+++ b/is/is.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-27 13:43+0000\n"
-"Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ã?fram"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "InnskrÃ¡ning"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkomin Ã Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Nota varanlega gagnageymslu?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">HjÃ¡lparskjÃ¶l</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "JÃ¡"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lykilfrasi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "SkrifvariÃ°?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Rangur lykilfrasi. Reyndu aftur.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Fleiri mÃ¶guleikar?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "LykilorÃ° kerfisstjÃ³rnunar"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">HjÃ¡lparskjÃ¶l</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Settu upp lykilorÃ° fyrir kerfisstjÃ³rnun ef Ã¾Ãº Ã¾arft aÃ° sÃ½sla meÃ° kerfisstillingar.\nAnnars er lykilorÃ° fyrir kerfisstjÃ³rnun haft Ã³virkt Ã Ã¶ryggisskyni."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "LykilorÃ°:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Sannvotta lykilorÃ°:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>LykilorÃ°in stemma ekki</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "DulbÃºningur MAC-vistfangs"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">HjÃ¡lparskjÃ¶l</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "DulbÃºningur MAC-vistfangs felur raÃ°nÃºmer netkortsins fyrir staÃ°arnetinu. Ã?aÃ° getur hjÃ¡lpaÃ° til viÃ° aÃ° fela staÃ°setningu Ã¾Ãna."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "DulbÃºningur MAC-vistfangs er almennt Ã¶ruggara, en Ã¾aÃ° getur aftur valdiÃ° vandamÃ¡lum Ã tengingum eÃ°a litiÃ° grunsamlega Ãºt."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "DulbÃºa Ã¶ll MAC-vistfÃ¶ng"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Stillingar netkerfis"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">HjÃ¡lparskjÃ¶l</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internet-tenging Ã¾essarar tÃ¶lvu er Ã¡n hindrana. Ã?Ãº getur tengst Tor-netinu beint."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internet-tenging Ã¾essarar tÃ¶lvu er ritskoÃ°uÃ°, sÃuÃ° eÃ°a beint Ã gegnum milliÃ¾jÃ³n. Ã?Ãº Ã¦ttir aÃ° stilla uppsetningu fyrir brÃ½r, eldvegg eÃ°a milliÃ¾jÃ³n."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Afvirkja alla netvinnslu"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "TungumÃ¡l"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "StaÃ°fÃ¦rsla"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Framsetning"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist mistÃ³kst meÃ° svarkÃ³Ã°a %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup mistÃ³kst meÃ° svarkÃ³Ã°a %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist mistÃ³kst meÃ° svarkÃ³Ã°a %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "AnnaÃ°..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/it/it.po b/it/it.po
index ed348f3..ac85846 100644
--- a/it/it.po
+++ b/it/it.po
@@ -5,18 +5,18 @@
 # Translators:
 # Fandor, 2013
 # Fandor, 2013
-# il_doc <filippo.giomi@xxxxxxxxx>, 2014
+# il_doc, 2014
 # Francesca Ciceri <madamezou@xxxxxxxxxx>, 2014
 # spawned76 <fswitch20@xxxxxxxxxxx>, 2012
-# il_doc <filippo.giomi@xxxxxxxxx>, 2014
+# il_doc, 2014
 # Random_R, 2014-2015
 # spawned76 <fswitch20@xxxxxxxxxxx>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -25,170 +25,290 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Avanti"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Accesso"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Benvenuti in Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Utilizzare la persistenza?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.it.html\">Documentazione</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "SÃ¬"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase segreta:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Sola lettura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase segreta sbagliata. Provare di nuovo.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Altre opzioni?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Password di amministrazione"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.it.html\">Documentazione</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Inserire una password di amministrazione in caso si debbano eseguire delle attivitÃ  di amministrazione. In caso contrario la password di amministrazione sarÃ  disabilitata per migliorare la sicurezza."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifica password:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Le password non corrispondono</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Offuscamento dell'indirizzo MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.it.html\">Documentazione</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Offuscare l'indirizzo MAC significa nascondere il numero seriale della propria scheda di rete alle reti locali. Questo permette di non rendere nota la propria posizione geografica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalmente Ã¨ piÃ¹ sicuro oscurare l'indirizzo MAC, ma puÃ² generare sospetti o causare problemi di connessione."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Offusca tutti gli indirizzi MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configurazioni di rete"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.it.html\">Documentazione</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "La connessione a Internet di questo computer non Ã¨ bloccata in alcun modo. Volendo puoi connetterti direttamente alla rete Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "La connessione a Internet di questo computer Ã¨ bloccata da censura, filtrata o utilizza un proxy. Ã? necessario configurare un bridge, firewall o un proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Disattiva tutta la rete"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Lingua"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Impostazioni internazionali"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Disposizione"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ha fallito con return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ha fallito con return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ha fallito con return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Altro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ja/ja.po b/ja/ja.po
index 9b3a3f9..bfc4757 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "é?²ã??"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ã?ã?°ã?¤ã?³"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tailsã?¸ã??ã??ã??ã??"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "æ°¸ç¶?æ?§ã??ä½¿ç?¨ã??ã?¾ã??ã??ï¼?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ã??ã?ã?¥ã?¡ã?³ã??</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ã?¯ã??"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ã??ã??ã??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ã??ã?¹ã??ã?¬ã?¼ã?º:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "èªã?¿å??ã??å°?ç?¨ã?§ã??ã??ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ã??ã?¹ã??ã?¬ã?¼ã?ºã??é??é??ã?£ã?¦ã??ã?¾ã??ã??ã??ã??ç?´ã??ã?¦ã??ã? ã??ã??ã??</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ã??ã?®ä»?ã?®ã?ªã??ã?·ã?§ã?³ï¼?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ç®¡ç??è??ã??ã?¹ã?¯ã?¼ã??"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ã??ã?ã?¥ã?¡ã?³ã??</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "ç®¡ç??è??ã?®ã?¿ã?¹ã?¯ã??å®?è¡?ã??ã??å¿?è¦?ã??ã??ã??å ´å??ã??ç®¡ç??è??ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??ã??\nã?§ã?ªã??ã??ã?°ã??ã?»ã?ã?¥ã?ªã??ã?£å??ä¸?ã?®ã??ã??ã?«ç?¡å?¹ã?«ã?ªã??ã?¾ã??ã??"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ã??ã?¹ã?¯ã?¼ã??:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ã??ã?¹ã?¯ã?¼ã??ç¢ºèª?:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>ã??ã?¹ã?¯ã?¼ã??ã??ä¸?è?´ã??ã?¾ã??ã??</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC ã?¢ã??ã?¬ã?¹ã?¹ã?®æ??ã??ã??ã?¾ã??"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ã??ã?ã?¥ã?¡ã?³ã??</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC ã?¢ã??ã?¬ã?¹ã??ã?¹ã??ã?¼ã??ã?£ã?³ã?°ã??ã??ã?¨ã??ã?ã?¼ã?«ã?«ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?¼ã??ã?®ã?·ã?ªã?¢ã?«ã??ã?³ã??ã?¼ã??é? è?½ã??ã?¾ã??ã??ã??ã??ã?¯å?°ç??ç??æ??å ±ã?®é? è?½ã?«å½¹ç«?ã?¡ã?¾ã??ã??"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "æ?®é??ã?¯ MAC ã?¢ã??ã?¬ã?¹ã??ã?¹ã??ã?¼ã??ã?£ã?³ã?°ã??ã??ã?»ã??ã??å®?å?¨ã?§ã??ã??ã??ç??ã??ã??ã??ã??ã??ã??ã??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?®å??é¡?ã??å¼?ã??èµ·ã??ã??å ´å??ã??ã??ã??ã?¾ã??ã??"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "ã??ã?¹ã?¦ã?® MAC ã?¢ã??ã?¬ã?¹ã??æ??ã??ã??ã?¾ã??ã??ã??"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ã??ã?ã?¥ã?¡ã?³ã??</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "ã??ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?«ã?¯é??å®³ã??ã??ã??ã?¾ã??ã??ã?? Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?«ç?´æ?¥æ?¥ç¶?ã??ã?¾ã??ã??"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯è?½å??ã??å?¨ã?¦ç?¡å?¹å??"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "è¨?èª?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "å?°å??"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ã?¬ã?¤ã?¢ã?¦ã??"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persistã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persistã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "ã??ã?®ä»?..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/jv/jv.po b/jv/jv.po
index cab1906..288e9ce 100644
--- a/jv/jv.po
+++ b/jv/jv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Javanese (http://www.transifex.com/otf/torproject/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: jv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ka/ka.po b/ka/ka.po
index 66dd6c6..eaf2307 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Kristina Tyskiewicz <savannah5k@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "á?¨á??á?¡á??á??á??"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "á??á??á??á??á??á?? á??á?§á??á?¡ á??á?¥á??á??á??á?? á??á??á??á? á?«á??á??á??á??á?? Tails-á?¨á??"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "á??á??á??á?®"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "á??á? á??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "á??á??á? á??á??á??:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "á??á??á? á??á??á?? á??á? á??á?¡á?¬á??á? á??á??. á??á??á?®á??á??á?? á??á??á??á??á?? á?¡á?ªá??á??á??á??."
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "á??á??á??á??á??á??á?¡á?¢á? á??á?¢á??á? á??á?¡ á??á??á? á??á??á??"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "á??á??á? á??á??á??:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "á??á??á??á??á??á?¡á?¢á?£á? á??á?? á??á??á? á??á??á??:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "á??á??á? á??á??á??á??á?? á??á?  á??á??á??á?®á??á??á??á??"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "á??á??á??"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "á??á??á??á??á??á??á??á??á??"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "á?¡á?®á??á??..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/kk/kk.po b/kk/kk.po
index a97c552..5c68297 100644
--- a/kk/kk.po
+++ b/kk/kk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ð?Ð¾Ò?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/km/km.po b/km/km.po
index 47abab9..a99b251 100644
--- a/km/km.po
+++ b/km/km.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-08-25 03:48+0000\n"
-"Last-Translator: Sokhem Khoem <sokhem@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "á??á??á??á??á?¼á??â??á??á??á??á??"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "á??á?¼á??"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "á??á??á??á?¶á??á??á??á??â??á??á??á??á?¶á??á?? Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "á??á??á??á?¾ persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">á?¯á??á??á?¶á??</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "á??á?¶á??/á??á?¶á??"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "á??á??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "á??á??á??á?¶â??á??á??á??á??á?¶á??á??á??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "á??á?¶á??â??á??á??â??á?¢á?¶á???"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>á??á??á??á?¶â??á??á??á??á??á?¶á??á??â??á??á?»á??á?? á??á?¼á??â??á??á??á??á?¶á??á?¶á??â??á??á??á??á??á??á??á??á??</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "á??á??á??á??á?¾á??â??á??á??á??á?¾á???"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "á??á?¶á??á??á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á??á??â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">á?¯á??á??á?¶á??</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "á??á??á??á??á?¼á??â??â??á??á?¶á??á??á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á??á??â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??â??á??á??á??á?»á??â??á??á??á??á?¸â??á??á??á??â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??â??á??á?¶á??á??á?·á??á??á??â??á??á??á??á??á?¶á??á??â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??á??\ná??á??á??á??á?¶á??á??á?·á??á??á??á??â??á??á?¶â??á??á?¹á??â??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á?·á??â??á??á?¾á??á??á??á?¸â??á??á?»á??á??á??á??á?·á??á?¶á??â??á?²á??á??â??á??á?¶á??á??â??á??á??â??á??á??á??á??á?¾á??á??"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "á??á?¶á??á??á??â??á??á??á??á??á?¶á??á??á??"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "á??á??á??á??á??á??á??á??á?¶á??á??â??â??á??á?¶á??á??á??â??á??á??á??á??á?¶á??á??á??"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>á??á?¶á??á??á??á??á??á??á??á?¶á??á??â??á??á?·á??â??á??á??á??á?¼á??á??á??á??</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "á??á??á??á??á??á??â??á?¢á?¶á??á??á??á??á??á?¶á?? MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">á?¯á??á??á?¶á??</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "á??á?¶á??â??á??á??á??á??á??á??â??á?¢á?¶á??á??á??á??á??á?¶á?? MAC á??á?¶á??á??â??á??á??á??â??á??á??á??á??á?¸â??á??á?¶á??â??á??á??á??á??á?¶á??â??á??á??á??á??â??á?¢á??á??á??â??á??á??á??á??á??â??á??á??á??á??á?¶á??â??á??á?¼á??á??á??á??á?¶á??á?? á??á?¶â??á?¢á?¶á??â??á??á?½á??â??á?¢á??á??á??â??á??á?¶á??á??â??á??á?¸á??á?¶á??á??â??á??á?¼á??á?·á??á?¶á??á??á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "á??á?¶â??á??á?¼á??á??â??á??á?¶â??á??á?¶á??á??á??á??â??á??á?¶á??â??á??á?»á??á??á??á??á?·á??á?¶á??â??á??á?¾á??á??á??á?¸â??á??á??á??á??á??á??â??á?¢á?¶á??á??á??á??á??á?¶á??â?? MAC á??á??á?»á??á??á??á??â??á??á?¶â??á??á??â??á?¢á?¶á??â??á??á??á??á??á?¾á??â??á??á?¶á??â??á??á??á??á??á??á?? á?¬â??á??á??á??á?¾á?²á??á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á??â??á??á?¶á??â??á??á??á??á? á?¶á??"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "á??á??á??á??á??á??â??á?¢á?¶á??á??á??á??á??á?¶á?? MAC á??á?¶á??á??á?¢á??á??"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "á??á?¶á??â??á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??â??á??á??á??á??á?¶á??"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">á?¯á??á??á?¶á??</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "á??á?¶á??â??á??á??á??á?¶á??á??â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á?»á??á??á??á??á?¼á??á??á??â??á??á??á??â??á??á??á??á?¶á??á??á??á??á? á?¶â??á??á??á?? á?¢á??á??á??á??á??á??á??á??á??á?¶á??á??â??á??á??á??â??á??á??á??á?¶á??á??â??á??á??â??á??á??á??á??á?¶á?? Tor á??"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "á??á?·á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á??â??á??á?¶á??á??á?¢á??á??"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "á??á?¶á??á?¶"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "á??á?¸á??á?¶á??á??"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "á??á??á??á??á??"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "á??á?¶á??â??á??á??á?¶á??á??á?? live-persist á??á?¶á??á?½á?? return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "á??á?¶á??â??á??á??á?¶á??á??á?? cryptsetup á??á?¶á??á?½á?? return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "á??á?¶á??â??á??á??á?¶á??á??á?? live-persist á??á?¶á??á?½á?? return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "á??á??á??á??á??á??á??á??..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/kn/kn.po b/kn/kn.po
index 6922573..490d031 100644
--- a/kn/kn.po
+++ b/kn/kn.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à²®à³?à²?à²¦à³?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "à²ªà³?à²°à²µà³?à²¶"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "à²?à³?à²²à³?à²¸à³?â??à²?à³? à²¸à³?à²µà²¾à²?à²¤"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "à²?à²µà²§à²¿ à²¨à²?à²¤à²° à²?à²³à²¿à²?à³?à²?à³? à²?à²ªà³?à²ªà²¿à²?à³?à²¯à³??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à²?à²?à³?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à²?à²²à³?à²²"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "à²?à³?à²?à²¡à²¿à²ªà²¦"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "à²?à²¦à³?à²¦à²?à³?à²?à³? à²®à²¾à²¤à³?à²°?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>à²¤à²ªà³?à²ªà³? à²?à³?à²ªà³?à²¤à²ªà²¦. à²?à²¨à³?à²¨à³?à²?à²¦à³? à²¸à²² à²?à³?à²°à³? à²®à²¾à²¡à²¿.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "à²¹à³?à²?à³?à²?à²¿à²¨ à²?à²¯à³?à²?à³?à²?à²³à³? à²¬à³?à²?à²¾?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "à²?à²¡à²³à²¿à²¤à²¦ à²?à³?à²ªà³?à²¤à²ªà²¦"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr " à²?à²¡à²³à²¿à²¤à²¦ à²?à³?à²°à²¿à²¯à³?à²?à²³à²¨à³?à²¨ à²®à²¾à²¡à³?à²²à²¿à²?à³?à²?à³? à²?à²¡à²³à²¿à²¤à²¦ à²?à³?à²ªà³?à²¤à²ªà²¦ à²?à²¤à³?à²¤à²¿à²°à²¿.â??\nà²?à²²à³?à²²à²¾à²?à²¦à³?à²°à³?, à²?à²¡à²³à²¿à²¤à²¦ à²?à³?à²ªà³?à²¤à²ªà²¦à²µà²¨à³?à²¨ à²?à²¨à³?à²°à³?à²?à²¿à²¤à²µà²¾à²?à²¿à²¸à³?à²£."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "à²?à³?à²ªà³?à²¤à²ªà²¦:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "à²?à³?à²ªà³?à²¤à²ªà²¦ à²¦à³?à²¢à²ªà²¡à²¿à²¸à²¿:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>à²?à³?à²ªà³?à²¤à²ªà²¦ à²¤à²¾à²³à³?à²¯à²¾à²?à³?à²¤à²¿à²²à³?à²²<i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "à²à²¾à²·à³?"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "à²ªà³?à²°à²¾à²¦à³?à²¶à²¿à²?à²¤à³?"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "à²°à³?à²ª"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "à²²à³?à²µà³?-à²ªà²°à³?à²¸à²¿à²¸à³?à²?à³? (à²®à²¾à²¹à²¿à²¤à²¿à²¯à²¨à³?à²¨ à²¦à³?à²°à³?à²?à²?à²¾à²² à²?à²¾à²ªà²¾à²¡à³?à²¦à³?) à²? à²°à²¿à²?à²°à³?à²¨à³? à²?à³?à²¡à³? (à²«à²²à²¿à²¤à²¾à²?à²¶) à²¨à³?à²¡à²¿ à²«à²¼à³?à²²à²¾à²¯à³?à²¤à³?, %(returncode)s:â??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "à²?à³?à²°à²¿à²ªà³?à²?à³?-à²¸à³?à²?à²ªà³? à²?à²¥à²µà²¾ à²°à²¹à²¸à³?à²¯à²µà²¾à²?à²¿à²°à²¿à²¸à³? à²µà³?à²¯à²µà²¸à³?à²¥à³? à²? à²°à²¿à²?à²°à³?à²¨à³? à²?à³?à²¡à³?  à²?à²?à²¦à³?à²°à³? à²«à²²à²¿à²¤à²¾à²?à²¶ à²¨à³?à²¡à²¿ à²«à²¼à³?à²²à²¾à²¯à³?à²¤à³?, %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "à²²à³?à²µà³?-à²ªà²°à³?à²¸à²¿à²¸à³?à²?à³? (à²®à²¾à²¹à²¿à²¤à²¿à²¯à²¨à³?à²¨ à²¦à³?à²°à³?à²?à²?à²¾à²² à²?à²¾à²ªà²¾à²¡à³?à²¦à³?) à²? à²°à²¿à²?à²°à³?à²¨à³? à²?à³?à²¡à³? (à²«à²²à²¿à²¤à²¾à²?à²¶) à²¨à³?à²¡à²¿ à²«à²¼à³?à²²à²¾à²¯à³?à²¤à³?,%(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "à²¬à³?à²°à³?..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ko/ko.po b/ko/ko.po
index f59dd98..2f0fcc0 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# stevegrey <91.ragi@xxxxxxxxx>, 2014
+# stevegrey <inactive+stevegrey@xxxxxxxxxxxxx>, 2014
 # ilbe123 <a3057016@xxxxxxxxx>, 2014
 # Jamin <bakzaa@xxxxxxxxx>, 2014
 # Dr.what <javrick6@xxxxxxxxx>, 2014-2015
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Dr.what <javrick6@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,170 +21,290 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ì??ì?¼ë¡?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ë¡?ê·¸ì?¸"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tailsì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤!"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ì??êµ¬ì?± ì?¬ì?© í??ì??ê² ì?µë??ê¹??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ë¬¸ì??</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ì??"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ì??ë??ì?¤"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ì??í?¸ :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "ì?½ê¸° ì ?ì?©ì?¼ë¡? í??ì??ê² ì?µë??ê¹??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ì??í?¸ê°? ì??ëª»ë??ì??ì?µë??ë?¤. ë?¤ì?? ì??ë??í??ì?ì??ì?¤.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ì??ì?¸í?? ì?µì???"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ê´?ë¦¬ ì??í?¸"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ë¬¸ì??</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "ê´?ë¦¬ì?? ì??ì??ì?? ì??í??í?´ì?¼í??ë?? ê²½ì?° ê´?ë¦¬ì?? ì??í?¸ë¥¼ ì??ë ¥í??ì?ì??ì?¤.\nì??ë??ë©´ ë³´ì?? í?¥ì??ì?? ì??í?´ ì?¬ì?©í?  ì?? ì??ì?µë??ë?¤."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ì??í?¸ : "
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ì??í?¸ í??ì?¸ : "
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>ë¹?ë°?ë²?í?¸ê°? ì?¼ì¹?í??ì§? ì??ì?µë??ë?¤.</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC ì£¼ì?? ì??ì?¥"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ë¬¸ì??</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC ì£¼ì??ë¥¼ ì??ì?¥í??ì?¬ ë¡?ì»¬ ë?¤í?¸ì??í?¬ì?? ë?¤í?¸ì??í?¬ ì¹´ë??ì?? ì?¼ë ¨ ë²?í?¸ë¥¼ ì??í??í?©ë??ë?¤. ì?´ê²?ì?? ì§?ë¦¬ì ? ì ?ë³´ì?? ì??í??ì?? ë??ì??ì?´ ë?©ë??ë?¤."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ì?¼ë°?ì ?ì?¼ë¡? MAC ì£¼ì??ë¥¼ ì??ì?¥í??ë?? ê²?ì?´ ì??ì ?í??ì§?ë§?, ì??ì?¬ì?? ë¶?ë?¬ì?¼ì?¼í?¤ê±°ë?? ë?¤í?¸ì??í?¬ ì?°ê²° ë¬¸ì ?ë¥¼ ì?¼ì?¼í?¤ë?? ê²½ì?°ë?? ì??ì?µë??ë?¤."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "ëª¨ë?  MAC ì£¼ì??ë¥¼ ì??ì?¥í??ê¸°"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ë?¤í?¬ì??í?¬ êµ¬ì?±"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ë¬¸ì??</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "ì?´ ì»´í?¨í?°ì?? ì?¸í?°ë?· ì?°ê²°ì??ë?? ë¬¸ì ?ê°? ì??ì?µë??ë?¤. Tor ë?¤í?¸ì??í?¬ì?? ì§?ì ? ì?°ê²°í?©ë??ë?¤."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr " ë?¤í?¸ì??í?¬ ì?°ê²°ì?? ë¹?í??ì?±í??"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr ". "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ì?¸ì?´"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "ì§?ì?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ë ?ì?´ì??ì??"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persistê°? ì?¤í?¨í??ì?µë??ë?¤. ë°?í?? ì½?ë??ë?? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetupì?´ ì?¤í?¨í??ì?µë??ë?¤. ë°?í?? ì½?ë??ë?? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persistê°? ì?¤í?¨í??ì?µë??ë?¤. ë°?í?? ì½?ë??ë?? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "ê¸°í??..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po
index 6f8da56..0081fde 100644
--- a/ko_KR/ko_KR.po
+++ b/ko_KR/ko_KR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/otf/torproject/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: ko_KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ì??ì?¼ë¡?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ë¡?ê·¸ì?¸"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "í??ì?¼ì¦?ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "ì??"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "ì??ë??ì?¤"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ë¹?ë°?ë²?í?¸:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "ì?½ê¸° ì ?ì?©?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ë¹?ë°?ë²?í?¸ê°? í??ë ¸ì?µë??ë?¤. ë?¤ì?? ì??ë ¥í?´ ì£¼ì?ì??ì?¤.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ì??ì?¸ ì?¤ì ??"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ê´?ë¦¬ì?? ë¹?ë°?ë²?í?¸"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "ê´?ë¦¬ì?? ê¶?í??ì?´ í??ì??í?? ì??ì??ì?? í??ë?? ê²½ì?° ê´?ë¦¬ì?? ë¹?ë°?ë²?í?¸ë¥¼ ì??ë ¥í?´ì£¼ì?¸ì??. \nì??ë ¥í??ì§? ì??ì?? ê²½ì?° ë³´ì?? ë¬¸ì ?ë¡? ê´?ë¦¬ì?? ê¶?í??ì?? ì?»ì?? ì?? ì??ì?µë??ë?¤."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ë¹?ë°?ë²?í?¸:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ë¹?ë°?ë²?í?¸ í??ì?¸:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>ë¹?ë°?ë²?í?¸ê°? ì?¼ì¹?í??ì§? ì??ì?µë??ë?¤.</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC ì£¼ì?? ì?¤í?¸í??"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC ì£¼ì??ë¥¼ ì?¤í?¸í?? í?  ê²½ì?° ë?¤í?¸ì??í?¬ ì¹´ë??ì?? ì?¼ë ¨ë²?í?¸ë¥¼ ì?¸í?°ë?· ì??ì??ì?? ì?¨ê¸¸ ì?? ì??ì?µë??ë?¤. ì?´ ê²½ì?° ì»´í?¨í?°ì?? ì??ì¹?ë¥¼ ì?¨ê¸¸ ì?? ì??ì?µë??ë?¤."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ë³´í?µ ì?¤í?¸í??ì?? í??ë?? ê²?ì?´ ì??ì ?í??ë??, ì??ì?¬ì?? ë°?ì?? ì?? ì??ê³  ë?¤í?¸ì??í?¬ ì?°ê²°ì?´ ë¶?ì??ì ?í?  ì?? ì??ì?µë??ë?¤."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "MAC ì£¼ì?? ì?¤í?¸í?? í??ê¸°"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ë?¤í?¸ì??í?¬ ì?¤ì ?"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "ì?´ ì»´í?¨í?°ë?? ì?¸í?°ë?·ì?? ì?°ê²°ë??ë?? ë?° ì§?ì?¥ì?´ ì??ì?µë??ë?¤. ì»´í?¨í?°ë¥¼ ë°?ë¡? í? ë¥´ ë?¤í?¸ì??í?¬ì?? ì?°ê²°í??ê³  ì?¶ì?µë??ë?¤."
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "ì?¸ì?´"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ë ?ì?´ì??ì??"
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "ê¸°í??..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ku/ku.po b/ku/ku.po
index d5e3b4e..7071c9b 100644
--- a/ku/ku.po
+++ b/ku/ku.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kurdish (http://www.transifex.com/otf/torproject/language/ku/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ku\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po
index 4b64b0f..97fa9b7 100644
--- a/ku_IQ/ku_IQ.po
+++ b/ku_IQ/ku_IQ.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-09-16 20:19+0000\n"
-"Last-Translator: Rasti K5 <rasti.khdhr@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ø¨Û?ÚµÛ?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ù?Û?Ø®Û?Ø±"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ø¨Ú?Ø§Ø±Ø¯Û?Û? Ø²Û?Ø§ØªØ±Ø?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "ØªÛ?Ù¾Û?Ú?Û?Ù?Ø´Û?:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Ø²Ù?Ø§Ù?"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Ù?Û? ØªØ±..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/kw/kw.po b/kw/kw.po
index 6e6251d..04739c6 100644
--- a/kw/kw.po
+++ b/kw/kw.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Cornish (http://www.transifex.com/otf/torproject/language/kw/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: kw\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ky/ky.po b/ky/ky.po
index 1ad2e2b..f33d2ed 100644
--- a/ky/ky.po
+++ b/ky/ky.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kyrgyz (http://www.transifex.com/otf/torproject/language/ky/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð¡Ñ?Ñ?Ñ?Ó©Ð·:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/la/la.po b/la/la.po
index 8df09c1..8124175 100644
--- a/la/la.po
+++ b/la/la.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-09-24 12:18+0000\n"
-"Last-Translator: Alisa P <parashchenko.alisa@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: la\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "In frontem"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Inire"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Salve in Caudis"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usarene persistentiam?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentatio</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Est"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Non"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Sententia transilindi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Legerene tantum="
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Sententia transilindi falsa. Proba iterum.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Magis possibilitatum?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Verbum transilindi imperii"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentatio</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Inda verbum transilindi imperii, si negotia imperii facere debest.\nNisi, deest pro certitudine maiore."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Verbum transilindi"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verbum transilindi probare:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Verba transilini aequala non sunt</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Falsificatio sententiae MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentatio</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Falsificatio sententiarum MAC numerum versionis apparatus coniunctionis tui ad coniunctiones in loco. Id locum geographicum tuum latere adest."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Saepe certior est MAC sententias falsificere, sed etiam suspicionem aut problemata coniunctionis coniunctione facere potest."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Omnes sententias MAC falsificere"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configuratio coniunctionis"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentatio</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Coniunctio coniunctione computatorum computatoris sine problemata est. Ad Tor coniunctionem lineare coniungere vis."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Coniunctio coniunctionis computatorum ei computatoris mutata aut clausa est. Pontem aut murum ignis aut clavem configurare debes."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Omnes coniunctiones defacere"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "_"
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Lingua"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Transferatio"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Modus ostendationis"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist non fecit, resultatum est %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "crypt-setup non fecit, resultatum est %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist non fecit, resultatum est %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Alia..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/lb/lb.po b/lb/lb.po
index aa02497..3138a8c 100644
--- a/lb/lb.po
+++ b/lb/lb.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Tyler Durden <virii@xxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Virun"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Aloggen"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "WÃ«llkomm bei Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Eng bestÃ¤nneg SpÃ¤icherpartitioun benotzen?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentatioun</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Jo"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passwuert:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "SchreiwgeschÃ¼tzt?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Falscht Passwuert. ProbÃ©iert nach eng kÃ©ier.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "MÃ©i Optiounen?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratiounspasswuert"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentatioun</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Gitt een Administratiounspasswuert an, falls der Administratiounsaufgaben hutt.\nSoss gÃ«tt des Funktioun aus SÃ©cherheetsgrÃ«nn ofgeschalt."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passwuert:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Passwuert bestÃ¤tegen:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwierder passen net</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC Adress Manipulatioun"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentatioun</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC Adress Manipulatioun kann d'Serienummer vun der eegener Netzwierkkaart am lokale Netz verschleieren. Dat kann iech hÃ«llefen Ã¤ren Standuert geheim ze halen."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Et ass generell mÃ©i sÃ©cher seng MAC Adressen ze manipulÃ©ieren mÃ¤ et kann och opfalen oder Problemer mat der Verbindung zum Netzwierk verursaachen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "All MAC Adressen manipulÃ©ieren"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netzwierkastellungen"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentatioun</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Verbindung zum Internet vun dÃ«sem Computer ass HÃ«ndernÃ«sfrÃ¤i. Dir wÃ«llt iech direkt an Tor Netzwierk verbannen."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Verbindung zum Internet vun dÃ«sem Computer ass zensÃ©iert, gefiltert oder muss duerch e Proxy. Dir musst ee BrÃ©cke-Server, Ã¤r Firewall oder Ã¤r Proxy Astellungen kucken."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "All Netzwierkfunktiounen desaktivÃ©ieren"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "  "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Sprooch"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Uert"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist huet e Feeler erÃ«m ginn mam Code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup huet e Feeler erÃ«m ginn mam Code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist huet e Feeler erÃ«m ginn mam Code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Anerer"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/lg/lg.po b/lg/lg.po
index 00f6c1c..23a901b 100644
--- a/lg/lg.po
+++ b/lg/lg.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Ganda (http://www.transifex.com/otf/torproject/language/lg/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: lg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ln/ln.po b/ln/ln.po
index 7414a4a..998979b 100644
--- a/ln/ln.po
+++ b/ln/ln.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Lingala (http://www.transifex.com/otf/torproject/language/ln/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ln\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/lo/lo.po b/lo/lo.po
index 4e5ad23..53afa8b 100644
--- a/lo/lo.po
+++ b/lo/lo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "àºªàº»à»?àº?àº?à»?à»?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "àº¥àº»àº?àº?àº·à»?à»?àº?àº»à»?àº²à»?àº?à»?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à»?àº¡à»?àº?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "àº?à»?à»?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/lt/lt.po b/lt/lt.po
index c3c1c6f..b3fa0d5 100644
--- a/lt/lt.po
+++ b/lt/lt.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-23 22:46+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Pirmyn"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prisijungti"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Sveiki atvykÄ? Ä¯ Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Naudoti ilgalaikÄ¯ kaupiklÄ¯?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Taip"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "SlaptafrazÄ?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Tik skaitymui?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Bloga slaptafrazÄ?. PraÅ¡ome pamÄ?ginti dar kartÄ?.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Daugiau parametrÅ³?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administravimo slaptaÅ¾odis"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Jeigu norÄ?site atlikti administravimo uÅ¾duotis, Ä¯raÅ¡ykite administravimo slaptaÅ¾odÄ¯.\nPrieÅ¡ingu atveju, saugumo sumetimais jis bus iÅ¡jungtas. "
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "SlaptaÅ¾odis:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Pakartokite slaptaÅ¾odÄ¯:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>SlaptaÅ¾odÅ¾iai nesutampa</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adresÅ³ klastojimas"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adresÅ³ klastojimas nuslepia jÅ«sÅ³ tinklo plokÅ¡tÄ?s serijos numerÄ¯ vietiniuose tinkluose. Tai padeda nuslÄ?pti jÅ«sÅ³ geografinÄ? padÄ?tÄ¯. "
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Paprastai yra saugiau klastoti MAC adresus, taÄ?iau tai gali taip pat sukelti Ä¯tarimÄ? arba susijungimo su tinklu problemas."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Klastoti visus MAC adresus"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Tinklo konfigÅ«ravimas"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Å io kompiuterio interneto ryÅ¡ys yra be kliÅ«Ä?iÅ³. JÅ«s norÄ?tumÄ?te prisijungti tiesiogiai prie Tor tinklo."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Å io kompiuterio interneto ryÅ¡ys yra cenzÅ«ruojamas, filtruojamas arba jungiamas per Ä¯galiotÄ?jÄ¯ serverÄ¯. Jums reikia sukonfigÅ«ruoti tinklÅ³ tiltÄ?, uÅ¾kardÄ? ar Ä¯galiotojo serverio nustatymus."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "IÅ¡jungti visÄ? darbÄ? tinkle"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Kalba"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "LokalÄ?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "IÅ¡dÄ?stymas"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist nepavyko, grÄ?Å¾indama kodÄ? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nepavyko, grÄ?Å¾indama kodÄ? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nepavyko, grÄ?Å¾indama kodÄ? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Kita..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/lv/lv.po b/lv/lv.po
index 1f1021b..8f0db7d 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# OjÄ?rs Balcers <ojars.balcers@xxxxxxxxx>, 2012
-# OjÄ?rs Balcers <ojars.balcers@xxxxxxxxx>, 2013-2015
+# Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2012
+# Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "PÄ?rsÅ«tÄ«t"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "PieteikÅ¡anÄ?s"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "SveicinÄ?ti Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Vai lietot pastÄ?vÄ«bu?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DokumentÄ?cija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "JÄ?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "NÄ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ieejas frÄ?ze:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Tikai-lasÄ?ms?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Aplama ieejas frÄ?ze. LÅ«dzu mÄ?Ä£iniet vÄ?lreiz.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "VairÄ?k iespÄ?ju?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "AdministrÄ?Å¡anas parole"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DokumentÄ?cija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ja JÅ«su pienÄ?kumos ietilpst veikt administrÄ?Å¡anas pienÄ?kumus, ievadiet administrÄ?Å¡anas paroli.\nParoli neievadot, lielÄ?kas droÅ¡Ä«bas dÄ?Ä¼, to atspÄ?jos."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Parole:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "VerificÄ?t paroli:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Paroles nesakrÄ«t</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adreses maldinoÅ¡a maiÅ?a"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DokumentÄ?cija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adreses maldinoÅ¡a maiÅ?a jeb spÅ«fings slÄ?pj vietÄ?jiem tÄ«kliem JÅ«su tÄ«kla kartes seriÄ?lo numuru. Tas ir noderÄ«gi, lai slÄ?ptu JÅ«su Ä£eogrÄ?fiskÄ?s atraÅ¡anÄ?s vietu."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "VispÄ?rÄ«gÄ? gadÄ«jumÄ? ir droÅ¡Ä?k maldinoÅ¡i norÄ?dÄ«t MAC adreses, bet tas var radÄ«t aizdomas vai izraisÄ«t tÄ«kla savienojuma problÄ?mas."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "MaldinoÅ¡i norÄ?dÄ«t visas MAC adreses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "TÄ«kla konfigurÄ?Å¡ana"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DokumentÄ?cija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Å Ä« datora interneta savienojumam nav Å¡Ä·Ä?rÅ¡Ä¼u. VÄ?laties veidot tieÅ¡u savienojumu ar tÄ«klu Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "JÅ«su datora savienojums ar internetu ir cenzÄ?ts, filtrÄ?ts vai starpniekots. Jums jÄ?konfigurÄ? tiltu, ugunsmÅ«ru vai starpniekserveru iestatÄ«jumi."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "AtspÄ?jot jebkÄ?du tÄ«kloÅ¡anu"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Valoda"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "LokalizÄ?cija"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "IzkÄ?rtojums"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist nesekmÄ«gs, norÄ?dÄ«tais kods %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nesekmÄ«gs, norÄ?dÄ«tais kods %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nesekmÄ«gs, norÄ?dÄ«tais kods %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Cits..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/mg/mg.po b/mg/mg.po
index 898c3e9..d9512f7 100644
--- a/mg/mg.po
+++ b/mg/mg.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malagasy (http://www.transifex.com/otf/torproject/language/mg/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: mg\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/mi/mi.po b/mi/mi.po
index f038285..346d2d9 100644
--- a/mi/mi.po
+++ b/mi/mi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Maori (http://www.transifex.com/otf/torproject/language/mi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: mi\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/mk/mk.po b/mk/mk.po
index 80141f4..2139698 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ml/ml.po b/ml/ml.po
index fe325f4..6f05cef 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/mn/mn.po b/mn/mn.po
index 902bc55..6ba3a89 100644
--- a/mn/mn.po
+++ b/mn/mn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Mongolian (http://www.transifex.com/otf/torproject/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/mr/mr.po b/mr/mr.po
index 511a523..4884724 100644
--- a/mr/mr.po
+++ b/mr/mr.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Vikrant Korde <vikrant.korde@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: mr\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à¤«à¥?à¤°à¤µà¤°à¥?à¤¡"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à¤¹à¥?à¤¯"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à¤¨à¤¾à¤¹à¥?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po
index c55a255..a4579c3 100644
--- a/ms_MY/ms_MY.po
+++ b/ms_MY/ms_MY.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ke hadapan"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Log Masuk"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Selamat datang ke Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Gunakan persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ya"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Tidak"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frasa laluan:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Baca Sahaja?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Salah frasa laluan. Sila cuba sekali lagi.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Lebih banyak tetapan?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Kata laluan pentadir"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Masukkan kata laluan pentadbir dalam kes anda perlu untuk melaksanakan tugas-tugas pentadbiran.\nJika tidak, ia akan dimatikan untuk keselamatan yang lebih baik."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Kata laluan:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Sahkan Kata Laluan:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Kata laluan tidak sepadan</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Bahasa"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Lain..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/mt/mt.po b/mt/mt.po
index d325d60..d2455f3 100644
--- a/mt/mt.po
+++ b/mt/mt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Maltese (http://www.transifex.com/otf/torproject/language/mt/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: mt\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/my/my.po b/my/my.po
index b376bd3..9324de1 100644
--- a/my/my.po
+++ b/my/my.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: my\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "á?¡á??á?¾á?±á?·á??á?á?¯á?·"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "á??á?¯á??á?ºá??á?²á?·"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "á??á??á?ºá??á??á?¶á?·á?«"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "á??á??á?¬á?¸á??á?¾á??á?º - "
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "á??á?¬á??á?¬á??á??á?¬á?¸"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/nah/nah.po b/nah/nah.po
index 853eea1..001b927 100644
--- a/nah/nah.po
+++ b/nah/nah.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Nahuatl (http://www.transifex.com/otf/torproject/language/nah/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: nah\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/nap/nap.po b/nap/nap.po
index 7442dac..839acc8 100644
--- a/nap/nap.po
+++ b/nap/nap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Neapolitan (http://www.transifex.com/otf/torproject/language/nap/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: nap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/nb/nb.po b/nb/nb.po
index 7e9dcc0..c7b27b0 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-17 02:03+0000\n"
-"Last-Translator: Allan NordhÃ¸y <epost@xxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Fremover"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Innlogging"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkommen til Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Bruk vedvarende lagring?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passordsekvens:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrivebeskyttet?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Feil passord. PrÃ¸v igjen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Flere alternativ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administratorpassord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentasjon</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Skriv inn administrasjonspassord i tilfelle du trenger Ã¥ utfÃ¸re administratoroppgaver.\nHvis ikke vil dette bli avskrudd for bedret sikkerhet."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Bekreft passord:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passordene samsvarer ikke</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adressesimulering"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Simulering av MAC-adresser skjuler nettverkskortets serienummer pÃ¥ lokale nettverk. Dette kan bidra til Ã¥ skjule din geografiske plassering."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Det er generelt tryggere Ã¥ simulere MAC-adresser, men det kan ogsÃ¥ vekke mistanke eller forÃ¥rsake problemer med nettverkstilkoblingen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Simuler alle MAC-adresser"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nettverksoppsett"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Denne datamaskinens internettforbindelse er uten hindringer. Du Ã¸nsker Ã¥ koble direkte til Tor-nettverket."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Denne datamaskinens internettforbindelse er sensurert, filtrert eller gÃ¥r via en mellomtjener. Du mÃ¥ sette opp bro, brannmur, eller proxy-innstillinger. "
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Skru av all nettverkstilknytning"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "SprÃ¥k"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Land"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Oppsett"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist feilet med returkode %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist feilet med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Annetâ?¦"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nds/nds.po b/nds/nds.po
index b901689..4fb4a3b 100644
--- a/nds/nds.po
+++ b/nds/nds.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Low German (http://www.transifex.com/otf/torproject/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ne/ne.po b/ne/ne.po
index be93fa7..0c0dcdd 100644
--- a/ne/ne.po
+++ b/ne/ne.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/nl/nl.po b/nl/nl.po
index cbff823..359f4b9 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: Cleveridge <erwin.de.laat@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,170 +22,290 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Doorgaan"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welkom bij Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Persistentie gebruiken?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "Documentatie"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Wachtzin:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Verkeerd wachtwoord. Probeer opnieuw.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Meer opties?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Beheerderswachtwoord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "Documentatie"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Voer een beheerderswachtwoord in wanneer je beheerstaken moet kunnen uitvoeren.\nNiets ingevuld zal beheer worden uitgeschakeld voor betere veiligheid."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Wachtwoord verifiÃ«ren:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Wachtwoorden zijn niet gelijk</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adres spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "Documentatie"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adres spoofing verbergt het serienummer van je netwerkkaart op lokale netwerken. Dit kan helpen bij het verbergen van je geografische locatie."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Het is over het algemeen veiliger om MAC adressen te spoofen, het kan echter ook argwaan opwekken of verbindingsproblemen veroorzaken. Zie documentatie."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Alle MAC adressen spoofen"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netwerkconfiguratie"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "Documentatie"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "De internetverbinding van deze computer is vrij van obstakels. U wilt direct met het Tor netwerk verbinden."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "De internetverbinding van deze computer is gecensureerd, gefiltered of loopt via een proxy. U dient de bridge, firewall of proxy instellingen te configureren."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Alle netwerken uitschakelen"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Taal"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist lukte niet, return code %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup lukte niet, return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist lukte niet, return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Anders..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
index 7c29faa..25349ad 100644
--- a/nl_BE/nl_BE.po
+++ b/nl_BE/nl_BE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Verder"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Aanmelden"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welkom bij Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Persistence gebruiken?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentatie</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nee"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Verkeerde passphrase. Probeer opnieuw aub.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Meer opties?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Beheerderswachtwoord"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentatie</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Voer een beheerderswachtwoord in voor het geval u beheerderstaken dient uit te voeren.\nAnders zal dit onbruikbaar gemaakt worden voor betere beveiligingsdoeleinden."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Wachtwoord:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Wachtwoord VerifiÃ«ren:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Wachtwoorden komen niet overeen</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adres spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentatie</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mac-adres spoofing verbergt het serienummer van uw netwerkkaart voor lokale netwerken. Dit kan helpen om uw geografische locatie te verbergen."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Algemeen is het veiliger om Mac-adressen te spoofen, maar het zou ook verdenking kunnen verhogen of netwerkproblemen kunnen veroorzaken."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof alle MAC-adressen."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Netwerk configuratie"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentatie</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "De internetconnectie van deze computer is vrij van obstakels. U wilt direct connecteren met het Tor netwerk."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "De internetconnectie van deze computer is gecensureerd, gefilterd of voorzien van een proxy. U dient uw bridge, firewall of proxy instellingen te configureren."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Taal"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Lay-out"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Andere..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nn/nn.po b/nn/nn.po
index 7b29ffd..79d0950 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-07-30 05:02+0000\n"
-"Last-Translator: Finn Brudal <finnbrudal@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Fram"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Innlogging"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Velkomen til Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Bruka vedvarande lagring?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasjon</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nei"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passord:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skriveverna?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Feil passord. PrÃ¸v igjen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Fleire val?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrasjonspassord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentasjon</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Skriv inn eit handsamingspassord i tilfelle du treng Ã¥ utfÃ¸ra handsamingsuppgÃ¥vor.\nElles vil det verta slege av for betre tryggleik."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Passord:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Stadfest passord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passorda samsvarar ikkje</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC-adressaforfalsking"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Skriv</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ã? forfalske MAC-adressor gÃ¸ymer serietalet pÃ¥ nettverkskorti dine for dei lokale nettverki. Dette kan hjelpe deg med Ã¥ gÃ¸yma den geografiske plasseringi di."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Det er generelt tryggare Ã¥ forfalske MAC-adressor, men det kan Ã²g vekka mistanke eller valde nettverkssambandsvanskar."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Forfalsk alle MAC-adressor"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nettverksinnstillingar"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Skriv</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internettsambandet Ã¥t denne datamaskini er fri for hindringar. Du ynsker Ã¥ setje deg direkte i samband med Tor-nettverket."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internettsambandet Ã¥t denne datamaskini er sensurert, filtrert eller hev proxy. Du treng Ã¥ setja upp bro, brannvegg eller proxy-innstillingar."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "SlÃ¥ av alle nettverksfunksjonar"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "SprÃ¥k"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalitet"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Utforming"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist mislukkast med returkode %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup mislukkast med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist mislukkast med returkode %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Anna â?¦"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/nso/nso.po b/nso/nso.po
index d01c67b..278e1a5 100644
--- a/nso/nso.po
+++ b/nso/nso.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Northern Sotho (http://www.transifex.com/otf/torproject/language/nso/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: nso\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/oc/oc.po b/oc/oc.po
index 26eeb12..84e4859 100644
--- a/oc/oc.po
+++ b/oc/oc.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/om/om.po b/om/om.po
index 5856fbc..9c7aa1b 100644
--- a/om/om.po
+++ b/om/om.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2012-10-03 17:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: om\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/or/or.po b/or/or.po
index 17631bd..7cf822f 100644
--- a/or/or.po
+++ b/or/or.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: or\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/pa/pa.po b/pa/pa.po
index fd982c0..74ee3eb 100644
--- a/pa/pa.po
+++ b/pa/pa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à¨?à©±à¨?à©?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "à¨²à¨¾à¨?à¨?à¨¨"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "à¨?à©?à¨²à©? à¨µà¨²à©?à¨? à¨?à©? à¨?à¨?à¨?à¨? à¨¨à©?à©°"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "à¨?à¨?à©±à¨²à¨¤à¨¾ à¨µà¨°à¨¤à¨£à©? à¨¹à©??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">à¨¦à¨¸à¨¤à¨¾à¨µà©?à©?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à¨¹à¨¾à¨?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à¨¨à¨¹à©?à¨?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "à¨µà¨¾à¨?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "à¨?à©?à¨µà¨² à¨ªà©?à©?à¨¹à¨¨ à¨²à¨??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>à¨?à¨²à¨¤ à¨µà¨¾à¨? à¨¹à©?à¥¤ à¨«à©?à¨° à¨?à©?à¨¶à¨¿à¨¶ à¨?à¨°à©? à¨?à©?à¥¤</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "à¨¹à©?à¨° à¨?à©?à¨£à¨¾à¨??"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "à¨ªà©?à¨°à¨¶à¨¾à¨¶à¨?à©? à¨ªà¨¾à¨¸à¨µà¨°à¨¡"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">à¨¦à¨¸à¨¤à¨¾à¨µà©?à©?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "à¨?à©? à¨¤à©?à¨¸à©?à¨? à¨ªà©?à¨°à¨¶à¨¾à¨¶à¨?à©? à¨?à©°à¨® à¨?à¨°à¨¨à¨¾ à¨?à¨¾à¨¹à©?à©°à¨¦à©? à¨¹à©? à¨¤à¨¾à¨? à¨ªà©?à¨°à¨¶à¨¾à¨¶à¨?à©? à¨ªà¨¾à¨¸à¨µà¨°à¨¡ à¨¦à¨¿à¨?à¥¤\nà¨¨à¨¹à©?à¨? à¨¤à¨¾à¨? à¨µà©±à¨§ à¨¸à©?à¨°à©±à¨?à¨¿à¨? à¨²à¨? à¨?à¨¸ à¨¨à©?à©° à¨¬à©°à¨¦ à¨°à©±à¨?à¨¿à¨? à¨?à¨¾à¨µà©?à¨?à¨¾à¥¤"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "à¨ªà¨¾à¨¸à¨µà¨°à¨¡:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "à¨ªà¨¾à¨¸à¨µà¨°à¨¡ à¨ªà©?à¨¶à¨?à©?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>à¨ªà¨¾à¨¸à¨µà¨°à¨¡ à¨®à¨¿à¨²à¨¦à¨¾ à¨¨à¨¹à©?à¨? à¨¹à©?</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">à¨¦à¨¸à¨¤à¨¾à¨µà©?à©?</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "à¨¨à©?à©±à¨?à¨µà¨°à¨? à¨¸à©°à¨°à¨?à¨¨à¨¾"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">à¨¦à¨¸à¨¤à¨¾à¨µà©?à©?</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "à¨²à©?à¨?à©?à¨²"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "à¨²à©?à¨?à¨?à¨?"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "à¨¹à©?à¨°..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/pap/pap.po b/pap/pap.po
index 8a0eabb..fd524e3 100644
--- a/pap/pap.po
+++ b/pap/pap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Papiamento (http://www.transifex.com/otf/torproject/language/pap/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: pap\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/pl/pl.po b/pl/pl.po
index d0269ec..54c88b2 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -10,180 +10,300 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "W przÃ³d"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Witamy w Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ZapisywaÄ? dane?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacja</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Tak"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nie"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "HasÅ?o:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Tylko do odczytu?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ZÅ?e hasÅ?o. ProszÄ? sprÃ³bowaÄ? ponownie.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "WiÄ?cej opcji?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "HasÅ?o administracyjne"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacja</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "WprowadÅº hasÅ?o administracyjne, jeÅ?li trzeba bÄ?dzie wykonywaÄ? zadania administracyjne.\nW innym przypadku zostanie ono wyÅ?Ä?czone dla wiÄ?kszego bezpieczeÅ?stwa."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "HasÅ?o:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "PowtÃ³rz HasÅ?o:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>HasÅ?a nie pasujÄ?</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Spoofing adresu MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacja</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing adresu MAC ukrywa number seryjny Twojej kart sieciowych przed lokalnymi sieciami. To moÅ¼e pomÃ³c ukryÄ? Twoje poÅ?oÅ¼enie geograficzne."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalnie bezpiecznej jest korzystaÄ? z internetu po spoofingu adresu MAC, jednakÅ¼e moÅ¼e to wzbudziÄ? podejrzenia lub wywoÅ?aÄ? problemy z poÅ?Ä?czeniem sieciowym."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof'uj wszystkie adresy MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfiguracja sieci"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacja</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "PoÅ?Ä?czenie internetowe tego komputera jest wolne od przeszkÃ³d. Chcesz bezpoÅ?rednio podÅ?Ä?czyÄ? siÄ? do sieci Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "PoÅ?Ä?czenie internetowe tego komputera jest ocenzurowane, filtrowane lub przepuszczane przez proxy. Musisz skonfigurowaÄ? most, firewall lub ustawienia proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "WyÅ?Ä?cz wszystkie poÅ?Ä?czenia sieciowe"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "JÄ?zyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ustawienia regionalne"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "WyglÄ?d"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Inne..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/pms/pms.po b/pms/pms.po
index 0d061ae..8113ce9 100644
--- a/pms/pms.po
+++ b/pms/pms.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Piemontese (http://www.transifex.com/otf/torproject/language/pms/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: pms\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ps/ps.po b/ps/ps.po
index e936caf..cbaadfd 100644
--- a/ps/ps.po
+++ b/ps/ps.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Pushto (http://www.transifex.com/otf/torproject/language/ps/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ps\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/pt/pt.po b/pt/pt.po
index 3f01867..4012eec 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-14 14:17+0000\n"
-"Last-Translator: Manuela Silva <manuela.silva@xxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "AvanÃ§ar"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Iniciar SessÃ£o"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bem-vindo ao Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usar persistÃªncia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DocumentaÃ§Ã£o</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sim"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "NÃ£o"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase de palavra-passe :"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Apenas de leitura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase de palavra-passe errada. Por favor, tente novamente.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mais opÃ§Ãµes?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Palavra-passe de administraÃ§Ã£o"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DocumentaÃ§Ã£o</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Digite a aplavra-passe de administraÃ§Ã£o se precisar de efetuar tarefas administrativas.\nCaso contrÃ¡rio, esta serÃ¡ desativada para uma melhor seguranÃ§a."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Palavra-passe:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verificar palavra-passe:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>As palavras-passe nÃ£o correspondem</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Mascarar endereÃ§o MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaÃ§Ã£o</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mascarar endereÃ§os MAC oculta o nÃºmero de sÃ©rie das placas de rede Ã s redes locais. Isto pode ajudar a ocultar a sua localizaÃ§Ã£o geogrÃ¡fica."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ã? geralmente seguro enganar os endereÃ§os MAC, mas este tambÃ©m pode  levantar suspeitas ou causar problemas na rede."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Personificar todos os endereÃ§os MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraÃ§Ã£o de rede"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaÃ§Ã£o</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A ligaÃ§Ã£o deste computador Ã  Internet estÃ¡ livre de obstÃ¡culos. Pode ligar-se diretamente Ã  rede Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A ligaÃ§Ã£o deste computador Ã  Internet estÃ¡ censorada, filtrada ou redirecionada. Precisa de configurar ponte, firewall ou definiÃ§Ãµes de proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desativar toda a rede"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "DisposiÃ§Ã£o"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "O live-persist falhou com o cÃ³digo de retorno %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "O cryptsetup falhou com o cÃ³digo de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "O live-persist falhou com o cÃ³digo de retorno %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Outro ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index f8c6b8e..67ac455 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-05-28 09:57+0000\n"
-"Last-Translator: Communia <ameaneantie@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,170 +27,290 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "AvanÃ§ar/Encaminhar ???"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Entrar"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bem-vindo ao Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Usar persistÃªncia?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DocumentaÃ§Ã£o</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Sim"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "NÃ£o"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Frase-senha:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Somente leitura?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Frase-senha incorreta. Por favor, tente novamente.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mais opÃ§Ãµes?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Senha do administrador"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DocumentaÃ§Ã£o</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Crie uma senha do administrador caso vocÃª precise realizar tarefas administrativas.\nCaso contrÃ¡rio, para maior seguranÃ§a, essa funÃ§Ã£o serÃ¡ desabilitada ."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Senha:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifique a senha:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>As senhas nÃ£o correspondem</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Mascaragem de identidade de endereÃ§os MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaÃ§Ã£o</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Mascarar os endereÃ§os MAC ocultarÃ¡ da rede local o nÃºmero de sÃ©rie das suas placas de rede. Isso poderÃ¡ ajudÃ¡-lo a ocultar a sua localizaÃ§Ã£o geogrÃ¡fica.  "
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Em geral, mascarar a identidade de endereÃ§os MAC Ã© mais seguro, mas tambÃ©m pode aumentar suspeitas ou causar problemas de conexÃ£o de rede."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Mascarar a identidade de todos os endereÃ§os MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ConfiguraÃ§Ã£o de rede"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaÃ§Ã£o</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "A conexÃ£o deste computador a Internet nÃ£o apresenta obstÃ¡culos. Prefira conectar-se diretamente Ã  rede Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "A conexÃ£o a Internet desse computador estÃ¡ censurada, filtrada ou atrÃ¡s de um proxy. VocÃª precisa configurar as opÃ§Ãµes de ponte, de firewall ou de proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desativar toda rede"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Idioma"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Local"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Modelo"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist falhou com cÃ³digo de retorno %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup nÃ£o pÃ´de retornar o cÃ³digo %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist nÃ£o pÃ´de retornar o cÃ³digo %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Outro..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ro/ro.po b/ro/ro.po
index 62b5d5c..b424615 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
-"Last-Translator: kyx <mihaidiaconu@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ã?nainte"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Autentificare"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bun venit la Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Vrei sa folosesti persistenta?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentatie</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nu"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Parola:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Doar-citire?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ParolÄ? greÈ?itÄ?. ReincercaÈ?i.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Mai multe opÈ?iuni?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Parola administratorului"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentatie</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Introdu o parola de administrare in cazul in care esti nevoit sa efectuezi sarcini de administrare. Altfel va fi dezactivat pentru o securitate sporita."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Parola:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifica Parola"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Parolele nu se potrivesc</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "AdresÄ? MAC falsificatÄ?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DocumentaÈ?ie</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Falsificarea adresei MAC ascunde seria plÄ?cii de reÈ?ea Ã®n reÈ?eaua localÄ?. Aceasta vÄ? poate ajuta sÄ? ascundeÈ?i poziÈ?ia geograficÄ? unde vÄ? aflaÈ?i."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ã?n general este mai sigur sÄ? falsificaÈ?i adresele MAC, dar poate creÈ?te suspiciunea sau poate cauza probleme de conectare la reÈ?ea."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "FalsificÄ? toate adresele MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Configurare retea"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DocumentaÈ?ie</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "AceastÄ? conexiune la internet a computerului este fÄ?rÄ? nici un obstacol. V-ar plÄ?cea sÄ? vÄ? conectaÈ?i direct la reÈ?eaua Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "AceastÄ? conexiune la internet a computerului este cenzuratÄ?, filtratÄ?, sau prin proxy. Trebuie sÄ? configuraÈ?i puntea, firewall-ul, sau configurÄ?rile proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DezactivaÈ?i toate reÈ?elele"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "  "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "LimbÄ?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Traducere"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Aspect"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist eÈ?uat cu cod returnat %(returncode)s: \n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup eÈ?uat cu cod returnat %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist eÈ?uat cu cod returnat %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Altele..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ru/ru.po b/ru/ru.po
index 8c10382..e8f12ed 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -8,14 +8,14 @@
 # Denis Denis <stereodenis@xxxxxxxxx>, 2014
 # Ð?Ð»Ð¸Ñ?ÐµÐµÐ² Ð?Ð¼Ð¸Ñ?Ñ?Ð¸Ð¹ <inactive+ddark008@xxxxxxxxxxxxx>, 2012
 # Oul Gocke <beandonlybe@xxxxxxxxx>, 2014
-# Ð?Ð½Ð´Ñ?ÐµÐ¹ Ð?Ð¾Ñ?Ñ?Ñ?Ð¸ÐºÐ¾Ð² <yavinav@xxxxxxxxx>, 2016
+# Uho Lot <yavinav@xxxxxxxxx>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-24 16:30+0200\n"
-"PO-Revision-Date: 2016-05-02 02:51+0000\n"
-"Last-Translator: Ð?Ð½Ð´Ñ?ÐµÐ¹ Ð?Ð¾Ñ?Ñ?Ñ?Ð¸ÐºÐ¾Ð² <yavinav@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ð?Ð¿ÐµÑ?Ñ?Ð´"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ð?Ñ?Ð¾Ð´"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ? Ð² Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ñ?Ñ? Ð¿Ð°Ð¼Ñ?Ñ?Ñ??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ð?Ð°"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ð?ÐµÑ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Ð¢Ð¾Ð»Ñ?ÐºÐ¾ Ð´Ð»Ñ? Ñ?Ñ?ÐµÐ½Ð¸Ñ??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð¾Ð»Ñ?. Ð?Ð¾Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ñ?Ð½Ð¾Ð²Ð°.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ð?Ð¾Ð»Ñ?Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ð¹?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ð´Ð»Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ? Ð·Ð°Ð´Ð°Ñ? Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ?. Ð? Ð¿Ñ?Ð¾Ñ?Ð¸Ð²Ð½Ð¾Ð¼ Ñ?Ð»Ñ?Ñ?Ð°Ðµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ð¸ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð±Ñ?Ð´Ñ?Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ñ? Ð² Ñ?ÐµÐ»Ñ?Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ñ?Ð¹ Ð²Ð²Ð¾Ð´ Ð¿Ð°Ñ?Ð¾Ð»Ñ?:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Ð?Ð°Ñ?Ð¾Ð»Ð¸ Ð½Ðµ Ñ?Ð¾Ð²Ð¿Ð°Ð´Ð°Ñ?Ñ?</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐºÑ?Ñ?Ð²Ð°ÐµÑ? Ñ?ÐµÑ?Ð¸Ð¹Ð½Ñ?Ð¹ Ð½Ð¾Ð¼ÐµÑ? Ð²Ð°Ñ?ÐµÐ¹ Ñ?ÐµÑ?ÐµÐ²Ð¾Ð¹ ÐºÐ°Ñ?Ñ?Ñ? Ð¾Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ð¹ Ñ?ÐµÑ?Ð¸. ÐÑ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð²Ð°Ñ?Ðµ Ð³ÐµÐ¾Ð³Ñ?Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¾Ðµ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ð? Ñ?ÐµÐ»Ð¾Ð¼, Ð¿Ð¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½ÐµÐµ, Ð½Ð¾ Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð½Ð°Ð²Ð»ÐµÑ?Ñ? Ð¿Ð¾Ð´Ð¾Ð·Ñ?ÐµÐ½Ð¸Ñ? Ð¸Ð»Ð¸ Ð²Ñ?Ð·Ð²Ð°Ñ?Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ? Ñ?ÐµÑ?ÐµÐ²Ñ?Ð¼ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸ÐµÐ¼."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° Ð²Ñ?ÐµÑ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð¾Ð²"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ñ?ÐµÑ?Ð¸"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ð¸Ñ?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ð¡ÐµÑ?ÐµÐ²Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿Ñ?Ñ?Ñ?ÐµÑ?Ð° Ñ?Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾ Ð¾Ñ? Ð¿Ñ?ÐµÐ¿Ñ?Ñ?Ñ?Ñ?Ð²Ð¸Ð¹. Ð?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ðº Ñ?ÐµÑ?Ð¸ Tor Ð½Ð°Ð¿Ñ?Ñ?Ð¼Ñ?Ñ?."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²Ñ?Ðµ Ñ?ÐµÑ?ÐµÐ²Ñ?Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ð¯Ð·Ñ?Ðº"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ð?ÐµÑ?Ñ?Ð¾"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Ð Ð°Ñ?ÐºÐ»Ð°Ð´ÐºÐ°"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð», ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ %(returncode)s:\n %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð», ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ %(returncode)s:\n %(stdout)s\n %(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð», ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ %(returncode)s:\n %(stdout)s\n %(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ð?Ñ?Ñ?Ð³Ð¾Ðµ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ru@petr1708/ru@xxxxxxxxxxx b/ru@petr1708/ru@xxxxxxxxxxx
index 071f880..174a0ed 100644
--- a/ru@petr1708/ru@xxxxxxxxxxx
+++ b/ru@petr1708/ru@xxxxxxxxxxx
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Russian Petrine orthography (http://www.transifex.com/otf/torproject/language/ru@petr1708/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: ru@petr1708\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ð?Ð°"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ð?Ñ£Ñ?Ñ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/scn/scn.po b/scn/scn.po
index ca83936..d91cb42 100644
--- a/scn/scn.po
+++ b/scn/scn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Sicilian (http://www.transifex.com/otf/torproject/language/scn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: scn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/sco/sco.po b/sco/sco.po
index c9d385d..15aea55 100644
--- a/sco/sco.po
+++ b/sco/sco.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Scots (http://www.transifex.com/otf/torproject/language/sco/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: sco\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po
index 0dc10a8..0c19f62 100644
--- a/si_LK/si_LK.po
+++ b/si_LK/si_LK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à¶?à¶¯à·?à¶»à·? à¶¯à·?à¶¸à¶?à¶»à¶«à¶º"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "à¶´à·?à¶»à·?à¶¸"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr " Tails à·?à¶½à¶§ à¶´à·?à·?à·?à¶?à¶±à·?à¶±à·?à·?"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "à·?à·?à¶®à·?à·?à¶» à¶·à·?à·?à·?à¶à·? à¶?à¶»à¶±à·?à·?à¶¯?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à¶?à·?à·?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à¶±à·?à¶"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "à¶¸à·?à¶»à·?à·?à¶?à·?à¶º:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "à¶?à·?à¶ºà·?à·?à¶¸à¶§-à¶´à¶¸à¶«à¶¯?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>à·?à·?à¶»à¶¯à·? à¶¸à·?à¶»à·?à·?à¶?à·?à¶ºà¶?à·?. à¶?à¶»à·?à¶«à·?à¶?à¶» à¶±à·?à·?à¶ à¶?à¶à·?à·?à·?à·? à¶?à¶»à¶±à·?à¶±.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "à¶à·?à¶à·? à·?à·?à¶?à¶½à·?à¶´?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "à¶´à¶»à·?à¶´à·?à¶½à¶? à¶¸à·?à¶»à¶´à¶¯à¶º "
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "à¶´à¶»à·?à¶´à·?à¶½à¶± à¶?à·?à¶»à·?à¶ºà¶ºà¶±à·? à¶?à·?à¶»à·?à¶¸à¶§ à¶?à·?à·?à·?â??à¶º à·?à·?à·?à·?à¶§ à¶´à¶»à·?à¶´à·?à¶½à¶? à¶¸à·?à¶»à¶´à¶¯à¶º à¶?à¶à·?à·?à¶à·? à¶?à¶»à¶±à·?à¶± .\nà¶?à·?à·? à¶±à·?à¶¸à·?à¶à·? à·?à·?à·?à·?à·?à¶à·? à·?à¶©à·? à¶?à¶»à¶?à·?à·?à·?à·? à·?à¶¯à·?à·? à¶?à¶º à¶¯à·?à¶¶à¶½ à·?à¶±à·? à¶?à¶."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "à¶¸à·?à¶»à¶´à¶¯à¶º:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "à¶¸à·?à¶»à¶´à¶¯à¶º à·?à¶à·?â??à¶ºà·?à¶´à¶±à¶º à¶?à¶»à¶±à·?à¶±:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>à¶¸à·?à¶»à¶´à¶¯ à¶?à·?à¶½à¶´à·?à¶±à·?à¶±à·? à¶±à·?à¶</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "                                                                   "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "à¶·à·?à·?à·?à·?"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "à¶´à·?à¶¯à·?à·?à·?à¶º"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "à¶´à·?à¶»à·?à·?à·?à¶½à·?à·?à¶¸"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "à¶´à·?à¶½à·?à·?à¶?à¶?à·?à¶à¶ºà¶?à·? à·?à·?à·?à¶à·? à·?à¶¢à·?à·?à·?-à·?à·?à¶®à·?à·?à¶» %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "à¶´à·?à¶½à·?à¶?à·?à¶à¶ºà¶?à·? à·?à·?à·?à¶à·? cryptsetup à¶¶à·?à¶¯à·?à·?à¶§à·?à¶«à·? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "à¶´à·?à¶½à·?à¶?à·?à¶à¶ºà¶?à·? à·?à·?à·?à¶à·?à·?à¶¢à·?à·?à·?-à·?à·?à¶®à·?à·?à¶» à¶¶à·?à¶¯à·?à·?à¶§à·?à¶«à·? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "à·?à·?à¶±à¶à·?..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sk/sk.po b/sk/sk.po
index b8210b5..8dcdecc 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "PoslaÅ¥ Ä?alej"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "PrihlÃ¡senie"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Vitajte v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "PouÅ¾iÅ¥ ukladanie na disk?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DokumentÃ¡cia</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ã?no"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nie"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "HeslovÃ¡ frÃ¡za: "
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Len na Ä?Ãtanie?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>NesprÃ¡vne heslo. ProsÃm skÃºste znovu.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Viac moÅ¾nostÃ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "AdministraÄ?nÃ© heslo"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DokumentÃ¡cia</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "VloÅ¾te administraÄ?nÃ© heslo ak chcete robiÅ¥ administraÄ?nÃ© Ãºlohy.\nAk heslo nevloÅ¾Ãte, bude tÃ¡to moÅ¾nosÅ¥ deaktivovanÃ¡ pre bezpeÄ?nostnÃ© ÃºÄ?ely."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Heslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "PotvrÄ? heslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>HeslÃ¡ sa nezhodujÃº</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Spoofovanie MAC adresy"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DokumentÃ¡cia</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofovanie MAC adries skryje sÃ©riovÃ© Ä?Ãsla vaÅ¡ich sieÅ¥ovÃ½ch kariet pre lokÃ¡lne siete. Toto napomÃ´Å¾e k schovaniu vaÅ¡ej geografickej polohy."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Celkovo je lepÅ¡ie spoofnuÅ¥ MAC adresy, na druhej strane to vÅ¡ak mÃ´Å¾e zvÃ½Å¡iÅ¥ podozrenie alebo spÃ´sobiÅ¥ problÃ©my so sieÅ¥ou."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "SpoofnuÅ¥ vÅ¡etky MAC adresy"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "SieÅ¥ovÃ¡ konfigurÃ¡cia"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DokumentÃ¡cia</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Pripojenie tohto poÄ?ÃtaÄ?a k Internetu je bez akÃ½chkoÄ¾vek prekÃ¡Å¾ok. Asi sa teda chcete pripojiÅ¥ priamo k sieti Toru."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Pripojenie tohto poÄ?ÃtaÄ?a k Internetu je cenzurovanÃ©, filtrovanÃ© alebo sprostredkovÃ¡vanÃ©. Potrebujete si nakonfigurovaÅ¥ most, firewall alebo nastavenia proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jazyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Miestne"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "RozloÅ¾enie"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist zlyhal s chybovÃ½m kÃ³dom %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup zlyhal s chybovÃ½m kÃ³dom %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist zlyhal s chybovÃ½m kÃ³dom %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "OstatnÃ©..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index b51ba75..9278bd1 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dasa M <littlearchr8@xxxxxxxxx>, 2016
-# MariÃ¡n MiÅ¾ik <marian@xxxxxxxx>, 2015
+# DaÅ¡a MatÃºÅ¡ovÃ¡, 2016
+# MariÃ¡n MiÅ¾ik <inactive+marian.mizik@xxxxxxxxxxxxx>, 2015
 # once, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-07-12 20:18+0000\n"
-"Last-Translator: Dasa M <littlearchr8@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Dopredu"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "PrihlÃ¡senie"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Vitajte v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "PouÅ¾iÅ¥ perzistenciu?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">DokumentÃ¡cia</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ã?no"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nie"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "PrÃstupovÃ© heslo:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Iba na Ä?Ãtanie?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>NesprÃ¡vne prÃstupovÃ© heslo. ProsÃm, skÃºste znova.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Viac moÅ¾nostÃ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Heslo sprÃ¡vcu"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">DokumentÃ¡cia</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Pre prÃpad potreby vykonÃ¡vaÅ¥ Ãºlohy sprÃ¡vcu, zadajte heslo sprÃ¡vcu.\nV opaÄ?nom prÃpade bude zakÃ¡zanÃ© pre vyÅ¡Å¡iu bezpeÄ?nosÅ¥."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Heslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Overte heslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>HeslÃ¡ nesÃºhlasia</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Predstieranie MAC adresy"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">DokumentÃ¡cia</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Predstieranie MAC adries skryje sÃ©riovÃ© Ä?Ãslo vaÅ¡ej sieÅ¥ovej karty pred miestnou sieÅ¥ou. To mÃ´Å¾e pomÃ´cÅ¥ skryÅ¥ vaÅ¡u geografickÃº polohu."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Je vÅ¡eobecne bezpeÄ?nejÅ¡ie predstieraÅ¥ MAC adresy, mÃ´Å¾e to vÅ¡ak vyvolaÅ¥ podozrenie alebo spÃ´sobiÅ¥ problÃ©my s pripojenÃm."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "PredstieraÅ¥ vÅ¡etky MAC adresy"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "KonfigurÃ¡cia siete"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">DokumentÃ¡cia</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Pripojenie tohto poÄ?ÃtaÄ?a na Internet je bez prekÃ¡Å¾ok. MÃ´Å¾ete sa priamo pripojiÅ¥ do siete Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Pripojenie tohto poÄ?ÃtaÄ?a je cenzurovanÃ©, filtrovanÃ© alebo vedenÃ© cez proxy. Potrebujete nastaviÅ¥ premostenie, firewall alebo proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DeaktivovaÅ¥ vÅ¡etky siete"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jazyk"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "LokalizÃ¡cia"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "RozloÅ¾enie"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist zlyhalo s kÃ³dom %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup zlyhalo s kÃ³dom %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist zlyhalo s kÃ³dom %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "OstatnÃ©..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sl/sl.po b/sl/sl.po
index aa4b929..cda1869 100644
--- a/sl/sl.po
+++ b/sl/sl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprej"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "DobrodoÅ¡li v Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Trajna namestitev?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Geslo:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo za branje?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "NapaÄ?no geslo. Poizkusite ponovno."
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Dodatne moÅ¾nosti?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Geslo upravitelja"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ä?e se Å¾elite lotiti upraviteljskih opravil, vnesite upraviteljsko geslo.â??\nSicer bo slednje zavoljo veÄ?je varnosti onemogoÄ?eno."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Geslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Ponoven vnos gesla:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Gesli se ne ujemata</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Krajevne nastavitve"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postavitev"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist je spodletel z vrnjeno kodo %(returncode)s:â??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup je spodletel z vrnjeno kodo %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist je spodletel z vrnjeno kodo %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Drugo ..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sl_SI/sl_SI.po b/sl_SI/sl_SI.po
index e9c6d9e..72c1820 100644
--- a/sl_SI/sl_SI.po
+++ b/sl_SI/sl_SI.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/language/sl_SI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Naprej"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Prijava"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "DobrodoÅ¡li v Sledi"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Uporabite vztrajanje?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Geslo za kljuÄ?e:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo-Beri?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>NapaÄ?no geslo. Prosimo za nov poskus.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "VeÄ? moÅ¾nosti?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administracijsko geslo"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Vnesite geslo administratorja za primer, da ga potrebujete za opravljanje administrativnih nalog.\nV nasprotnem primeru bo onemogoÄ?en za veÄ?jo varnost."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Geslo:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Preveri geslo:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Geslo se ne ujema</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "sleparjenje MAC naslova"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Sleparjenje MAC naslova skrije ser.Å¡t. omreÅ¾ne kartice v lokalnem omreÅ¾ju. S tem skrijete svoj geografski poloÅ¾aj."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "V glavnem je varno slepariti MAC naslov, lahko pa povzroÄ?i sumniÄ?enje ali probleme pri omreÅ¾ni povezavi."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Slepari vse MAC naslove"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Nastavitev omreÅ¾ja"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ta raÄ?unalniÅ¡ka internetna povezava je brez ovir. Å½elite neposredno povezavo z omreÅ¾jem Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Ta raÄ?unalniÅ¡ka internetna povezava, je cenzurirana, filtrirana ali nameÅ¡Ä?ena. Morate konfigurirati nastavitve mostu, poÅ¾arnega zidu ali nastavitve proxy."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokalno"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postavitev"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist ponesreÄ?en z vrnjeno kodo %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup ponesreÄ?en z vrnjeno kodo %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist ponesreÄ?en z vrnjeno kodo %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Drugo ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sn/sn.po b/sn/sn.po
index bab7b37..38af719 100644
--- a/sn/sn.po
+++ b/sn/sn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Shona (http://www.transifex.com/otf/torproject/language/sn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: sn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/so/so.po b/so/so.po
index e248a27..cdefc1a 100644
--- a/so/so.po
+++ b/so/so.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Somali (http://www.transifex.com/otf/torproject/language/so/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/son/son.po b/son/son.po
index 3cd3a12..0786c91 100644
--- a/son/son.po
+++ b/son/son.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: son\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/sq/sq.po b/sq/sq.po
index b7d8fd1..71f3da7 100644
--- a/sq/sq.po
+++ b/sq/sq.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-22 15:44+0000\n"
-"Last-Translator: Bujar Tafili\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "PÃ«rpara"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Hyni"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "MirÃ« se vini tek Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Do ta pÃ«rdorni vazhdueshmÃ«rinÃ«?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacion</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Po"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Jo"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "ParullÃ«:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "VetÃ«m pÃ«r Lexim?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>ParullÃ« e gabuar. Ju lutemi pÃ«rpiquni sÃ«rish.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "MÃ« shumÃ« mundÃ«si?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "FjalÃ«kalimi i administrimit"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacion</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Futni njÃ« fjalÃ«kalimin administrimi, nÃ« rasatin kur ju nevojitet tÃ« zbatoni detyrat e administrimit.\nPÃ«rkundÃ«r, ajo do tÃ« paaftÃ«sohet pÃ«r njÃ« siguri mÃ« tÃ« mirÃ«."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "FjalÃ«kalim:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verifikoni FjalÃ«kalimin:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>FjalÃ«kalimet nuk pÃ«rputhen</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "rreng me adresÃ«n MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacion</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Rrengu me adresat MAC e fsheh numrin serial tÃ« kartave tuaja tÃ« rrjetit, tek rrjetet lokalÃ«. Kjo mund t'ju ndihmojÃ« tÃ« fshihni vendndodhjen gjeografike."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "PÃ«rgjithÃ«sisht Ã«shtÃ« mÃ« e sigurt t'u bÃ«sh rreng adresave MAC, por kjo gjithashtu mund tÃ« ngrejÃ« dyshime, ose tÃ« shkaktojÃ« probleme tÃ« lidhjes sÃ« rrjetit."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "BÃ«ni rreng me tÃ« gjitha adresat MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Konfigurimi i rrjetit"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacion</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Lidhja Internet e kÃ«tij kompjuteri Ã«shtÃ« e pastruar nga pengesat. Ju do tÃ« donit tÃ« lidheshit drejtpÃ«rdrejt nÃ« rrjetin Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Lidhja e Internetit tÃ« kÃ«tij kompjuteri Ã«shtÃ« e censuruar, e filtruar ose me proxy. Duhet tÃ« konfiguroni urÃ«n, murin e zjarrtÃ«, ose proxy-n."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ã?'aktivizoni tÃ« gjitha rrjetet"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Gjuha"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Vendndodhje"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Paraqitje"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "rikthimi i tÃ« dhÃ«nave dÃ«shtoi me kodin e kthimit %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "konfigurimi i shifrimit dÃ«shtoi me kodin e kthimit %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "rikthimi i tÃ« dhÃ«nave dÃ«shtoi me kodin e kthimit %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "TjetÃ«r..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sr/sr.po b/sr/sr.po
index 13e2581..951d2c1 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Uloguj se"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "DobrodoÅ¡li u Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Koristi upornost?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "NE"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo-iÅ¡Ä?itavanje?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "PogreÅ¡na lozinka. Molimo pokuÅ¡ajte ponovo."
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "JoÅ¡ opcija?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrativna lozinka"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administrativnu lozinku u sluÄ?aju da Å¾elite da vrÅ¡ite administratorske zadatke.\nUnaÄ?e Ä?e oni biti onemoguÄ?eni radi bolje bezbednosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdi lozinku:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "Lozinke se ne podudaraju"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr "."
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postava"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:â??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup neuspeo sa povratnim kodom %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sr@latin/sr@xxxxxxxx b/sr@latin/sr@xxxxxxxx
index 635d8fe..46ff9d1 100644
--- a/sr@latin/sr@xxxxxxxx
+++ b/sr@latin/sr@xxxxxxxx
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# JanaDi <dijana1706@xxxxxxxxx>, 2015
+# JanaDi <inactive+JanaDi@xxxxxxxxxxxxx>, 2015
 # tentaclewarrior <exterminator996@xxxxxxxxx>, 2014
 # Milenko Doder <svrsavamutebe@xxxxxxxxx>, 2013
 # macak <nikola.stojakovic@xxxxxxxxxxx>, 2014
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -21,170 +21,290 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Napred"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Uloguj se"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "DobrodoÅ¡li u Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Koristi upornost?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Da"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ne"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Lozinka"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Samo-iÅ¡Ä?itavanje?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "PogreÅ¡na lozinka. Molimo pokuÅ¡ajte ponovo."
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "JoÅ¡ opcija?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administrativna lozinka"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentacija</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Unesite administrativnu lozinku u sluÄ?aju da Å¾elite vrÅ¡iti administratorske zadatke.\nInaÄ?e Ä?e oni biti onemoguÄ?eni radi bolje sigurnosti."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Lozinka:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Potvrdi lozinku:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "Lozinke se ne podudaraju"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Prikrivanje MAC adrese"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Prikrivanje MAC adrese je proces pri kom se sakriva serijski broj vaÅ¡e mreÅ¾ne kartice u lokalnoj mreÅ¾i. Ovo vam moÅ¾e pomoÄ?i da prikrijete vaÅ¡u lokaciju."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Generalno je bezbednije prikriti MAC adresu, ali to moÅ¾e izazvati mnoge probleme sa mreÅ¾nom konekcijom."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Prikrij sve MAC adrese"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "MreÅ¾na konfiguracije"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentacija</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Internet konekcija ovog kompjutera nema prepreke. Voleli biste da se konektujete direktno kroz Tor mreÅ¾u."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Internet konekcija ovog kompjutera je cenzurisana, filtrirana ili je pod proxy-em. Morate konfigurisati most, zaÅ¡titni zid ili proxy podeÅ¡avanja."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Jezik"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lokal"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Postava"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:â??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup neuspeo sa povratnim kodom %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist neuspeo sa povratnim kodom %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ostalo..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/st/st.po b/st/st.po
index 432400f..63f26a4 100644
--- a/st/st.po
+++ b/st/st.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Sotho, Southern (http://www.transifex.com/otf/torproject/language/st/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/su/su.po b/su/su.po
index 8ca79eb..dae0b04 100644
--- a/su/su.po
+++ b/su/su.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Sundanese (http://www.transifex.com/otf/torproject/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/sv/sv.po b/sv/sv.po
index 9529ea3..7552cc0 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -5,7 +5,7 @@
 # Translators:
 # Anders Nilsson <anders@xxxxxxxxx>, 2015
 # Gabor Sebastiani, 2014
-# Jonatan Nyberg <jonatan@xxxxxxxxxxxxx>, 2017
+# Jonatan Nyberg, 2017
 # Isis, 2014
 # WinterFairy <winterfairy@xxxxxxxxxx>, 2013
 # WinterFairy <winterfairy@xxxxxxxxxx>, 2013-2014
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-04-14 02:08+0000\n"
-"Last-Translator: Jonatan Nyberg <jonatan@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,170 +23,290 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "FramÃ¥t"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Logga in"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "VÃ¤lkommen till Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "AnvÃ¤nd bestÃ¥ende?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ja"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Nej"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "LÃ¶senord:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Skrivskyddad?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Fel lÃ¶senord. FÃ¶rsÃ¶k igen.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Fler alternativ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "AdministratÃ¶rslÃ¶senord"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Dokumentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ange ett administratÃ¶rslÃ¶senord ifall du behÃ¶ver utfÃ¶ra administrativa uppgifter.\nI annat fall kommer administratÃ¶rsÃ¥tkomst inaktiveras."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "LÃ¶senord:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Upprepa lÃ¶senord:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>LÃ¶senorden skiljer sig Ã¥t</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Fejka MAC-adresser"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Genom att fejka MAC-adresser dÃ¶ljer du serienummerna pÃ¥ dina nÃ¤tverkskort fÃ¶r de lokala nÃ¤tverken. Detta kan hjÃ¤lpa dig dÃ¶lja din geografiska position."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Vanligtvis Ã¤r det sÃ¤krast att fejka MAC-adresser, men att gÃ¶ra sÃ¥ kan ocksÃ¥ vÃ¤cka uppmÃ¤rksamhet eller orsaka nÃ¤tverksproblem."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Fejka alla MAC-adresser"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "NÃ¤tverkskonfiguration"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Dokumentation</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Den hÃ¤r datorns Internetanslutning Ã¤r fri frÃ¥n hinder. Du vill ansluta direkt till Tor-nÃ¤tverket."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Den hÃ¤r datorns Internetanslutning Ã¤r censorerad, filtrerad eller gÃ¥r genom en proxy. Du behÃ¶ver konfigurera brygg-, brandvÃ¤ggs- eller proxyinstÃ¤llningar."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Inaktivera alla nÃ¤tverk"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "SprÃ¥k"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Land"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Tangentbordslayout"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist misslyckades med felkod %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup misslyckades med felkod %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist misslyckades med felkod %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "Annat..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/sw/sw.po b/sw/sw.po
index 1fb19c7..a39b992 100644
--- a/sw/sw.po
+++ b/sw/sw.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: sw\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/szl/szl.po b/szl/szl.po
index a17dc90..9f585c7 100644
--- a/szl/szl.po
+++ b/szl/szl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Silesian (http://www.transifex.com/otf/torproject/language/szl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: szl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ta/ta.po b/ta/ta.po
index 8ffc147..0f07226 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
@@ -20,170 +20,290 @@ msgstr ""
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à®?à®ªà®¾à®°à¯?à®µà®°à¯?à®?à¯?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "à®ªà¯?à®?à¯?à®ªà®¤à®¿à®?à¯?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails à®?à¯?à®?à¯? à®µà®°à®µà¯?à®±à¯?à®?à®¿à®±à¯?à®¾à®®à¯?"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "à®¨à®¿à®²à¯?à®ªà¯?à®±à¯? à®ªà®¯à®©à¯?à®ªà®?à¯?à®¤à¯?à®¤ à®µà®¿à®°à¯?à®ªà¯?à®ªà®®à®¾?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">à®?à®µà®£à®?à¯?à®?à®³à¯?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à®?à®°à®¿"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à®?à®²à¯?à®²à¯?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®±à¯?à®±à¯?à®¾à®?à®°à¯?:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "à®ªà®?à®¿à®?à¯?à®? à®®à®?à¯?à®?à¯?à®®à¯??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>à®¤à®µà®±à®¾à®© à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®±à¯?à®±à¯?à®¾à®?à®°à¯?. à®®à¯?à®£à¯?à®?à¯?à®®à¯? à®®à¯?à®¯à®±à¯?à®?à®¿à®?à¯?à®?à®µà¯?à®®à¯?.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "à®®à¯?à®²à¯?à®®à¯? à®µà®¿à®°à¯?à®ªà¯?à®ªà®?à¯?à®?à®³à¯??"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "à®¨à®¿à®°à¯?à®µà®¾à®?à®¤à¯?à®¤à®¿à®©à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®²à¯?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">à®?à®µà®£à®?à¯?à®?à®³à¯?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "à®¨à®¿à®°à¯?à®µà®¾à®? à®ªà®£à®¿à®?à®³à¯? à®?à¯?à®¯à¯?à®¯ à®µà®´à®?à¯?à®?à®¿à®²à¯? à®?à®³à¯?à®³ à®?à®°à¯? à®¨à®¿à®°à¯?à®µà®¾à®?à®¤à¯?à®¤à®¿à®©à¯? à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®²à¯?à®²à¯? à®?à®³à¯?à®³à®¿à®?à®µà¯?à®®à¯?.\nà®?à®²à¯?à®²à¯?à®¯à¯?à®©à®¿à®²à¯? à®?à®¿à®±à®¨à¯?à®¤ à®ªà®¾à®¤à¯?à®?à®¾à®ªà¯?à®ªà¯? à®®à¯?à®?à®?à¯?à®?à®ªà¯?à®ªà®?à¯?à®®à¯?."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®²à¯?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®²à¯?à®²à¯? à®?à®°à®¿à®ªà®¾à®°à¯?à®?à¯?à®?à®µà¯?à®®à¯?:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>à®?à®?à®µà¯?à®?à¯?à®?à¯?à®¾à®±à¯?à®?à®³à¯? à®ªà¯?à®¾à®°à¯?à®¨à¯?à®¤à®µà®¿à®²à¯?à®²à¯?</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®®à®¾à®±à¯?à®±à¯?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">à®?à®µà®£à®?à¯?à®?à®³à¯?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC à®®à¯?à®?à®µà®°à®¿à®¯à¯? à®®à®¾à®±à¯?à®±à¯?à®µà®¤à¯? à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯? à®µà®©à¯?à®ªà¯?à®¾à®°à¯?à®³à®¿à®©à¯? à®µà®°à®¿à®?à¯? à®?à®£à¯?à®£à¯? à®?à®?à¯?à®?à®®à¯?à®³à¯?à®³  à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯?à®?à®²à®¿à®?à®®à®¿à®°à¯?à®¨à¯?à®¤à¯? à®®à®±à¯?à®?à¯?à®?à¯?à®®à¯?. à®?à®¤à¯? à®?à®?à¯?à®?à®³à¯? à®ªà¯?à®µà®¿à®¯à®¿à®¯à®²à¯? à®?à®?à®¤à¯?à®¤à¯? à®®à®±à¯?à®?à¯?à®?  à®?à®¤à®µà¯?à®®à¯?."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "à®ªà¯?à®¤à¯?à®µà®¾à®? MAC à®®à¯?à®?à®µà®°à®¿à®?à®³à¯? à®®à®¾à®±à¯?à®±à¯?à®µà®¤à¯? à®ªà®¾à®¤à¯?à®?à®ªà¯?à®ªà®¾à®©à®¤à¯?, à®?à®©à®¾à®²à®¿à®¤à¯? à®?à®¨à¯?à®¤à¯?à®?à®¤à¯?à®¤à¯?à®¯à¯? à®?à®²à¯?à®²à®¤à¯? à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯? à®?à®£à¯?à®ªà¯?à®ªà®¿à®²à¯? à®ªà®¿à®°à®?à¯?à®?à®©à¯?à®¯à¯?à®¯à¯?  à®?à®±à¯?à®ªà®?à¯?à®¤à¯?à®¤à®²à®¾à®®à¯?."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "à®?à®²à¯?à®²à®¾ MAC à®®à¯?à®?à®µà®°à®¿à®?à®³à¯?à®¯à¯?à®®à¯? à®®à®¾à®±à¯?à®±à¯?à®?"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯? à®?à®?à¯?à®?à®®à¯?à®ªà¯?à®ªà¯?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">à®?à®µà®£à®?à¯?à®?à®³à¯?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "à®?à®¨à¯?à®¤ à®?à®£à®¿à®©à®¿à®¯à®¿à®©à¯? à®?à®£à¯?à®¯ à®?à®£à¯?à®ªà¯?à®ªà®¿à®²à¯? à®¤à®?à¯?à®?à®³à¯? à®?à®²à¯?à®²à¯?. à®¨à¯?à®?à¯?à®?à®³à¯? à®¨à¯?à®°à®?à®¿à®¯à®¾à®? Tor à®¨à¯?à®?à¯?à®µà¯?à®°à¯?à®?à¯?à®?à¯?à®?à®©à¯? à®?à®£à¯?à®¯à®²à®¾à®®à¯?."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "à®?à®¨à¯?à®¤ à®?à®£à®¿à®©à®¿à®¯à®¿à®©à¯? à®?à®£à¯?à®¯ à®?à®£à¯?à®ªà¯?à®ªà®¿à®²à¯? à®¤à®£à®¿à®?à¯?à®?à¯?, à®µà®?à®¿à®?à®?à¯?à®?à®¿à®¤à®²à¯? à®?à®²à¯?à®²à®¤à¯? Proxy à®ªà¯?à®©à¯?à®± à®¤à®?à¯?à®?à®³à¯?à®³à¯?à®³à®©. à®¨à¯?à®?à¯?à®?à®³à¯? Bridge, Firewall à®?à®²à¯?à®²à®¤à¯? Proxy à®?à®®à¯?à®ªà¯?à®ªà¯?à®?à®³à¯? à®?à®?à¯?à®?à®®à¯?à®?à¯?à®?à®µà¯?à®£à¯?à®?à¯?à®®à¯?."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "à®?à®©à¯?à®¤à¯?à®¤à¯? à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯?à®?à®¿à®?à¯?à®?à¯? à®®à¯?à®?à®?à¯?à®?à¯?"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "à®®à¯?à®´à®¿"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "à®?à®¾à®?à¯?à®?à®¿à®?à¯?à®?à¯?à®°à®¿à®¯ à®?à®?à®®à¯?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "à®®à®¾à®¤à®¿à®°à®¿"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist return code %(returncode)s:\n%(stderr)s à®?à®?à®©à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®?à¯?à®¨à¯?à®¤à®¤à¯? "
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup return code %(returncode)s:\n%(stdout)s\n%(stderr)s \nà®?à®?à®©à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®?à¯?à®¨à¯?à®¤à®¤à¯? "
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist return code %(returncode)s:\n%(stdout)s\n%(stderr)s\nà®?à®?à®©à¯? à®¤à¯?à®²à¯?à®µà®¿à®¯à®?à¯?à®¨à¯?à®¤à®¤à¯? "
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "à®®à®±à¯?à®±à®µà¯?..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/te/te.po b/te/te.po
index 9c07925..ddc6703 100644
--- a/te/te.po
+++ b/te/te.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po
index 8b80c24..41a1e49 100644
--- a/te_IN/te_IN.po
+++ b/te_IN/te_IN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: te_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à°?à°¾à°¦à±? "
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/templates/tails-greeter.pot b/templates/tails-greeter.pot
index ca6532a..55d403a 100644
--- a/templates/tails-greeter.pot
+++ b/templates/tails-greeter.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr "Administration Password"
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Login"
+#: ../data/greeter.ui.h:2
+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."
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr "Enter an administration password"
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr "Confirm"
+
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr "Confirm your administration password"
+
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr "Disable"
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr "Windows Camouflage"
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+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."
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Welcome to Tails"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr "Microsoft Windows 10 camouflage"
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Use persistence?"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr "MAC Address Spoofing"
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing 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."
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Yes"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof all MAC addresses (default)"
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "No"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr "Don't spoof MAC addresses"
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cannot unlock encrypted storage with this passphrase."
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Read-Only?"
+#: ../data/greeter.ui.h:18
+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."
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr "Welcome to Tails!"
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "More options?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
+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"
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Administration password"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr "Language & Region"
 
-#: ../glade/optionswindow.glade.h:4
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr "Default Settings"
 
-#: ../glade/optionswindow.glade.h:5
-msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be 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."
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr "Save Language & Region Settings"
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Password:"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr "_Language"
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Verify Password:"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr "_Keyboard Layout"
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr "_Formats"
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC address spoofing"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr "_Time Zone"
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Spoofing MAC addresses hides the serial number of your network cards to the local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr "Show Passphrase"
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "It is generally safer to spoof MAC addresses, but it might also raise suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr "Configure Persistent Storage"
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Enter your passphrase to unlock the persistent storage"
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Network configuration"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr "Unlock"
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr "Relock Persistent Storage"
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "This computer's Internet connection is clear of obstacles. You would like to connect directly to the Tor network."
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
 
-#: ../glade/optionswindow.glade.h:18
-msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "This computer's Internet connection is censored, filtered, or proxied. You need to configure bridge, firewall, or proxy settings."
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
 
-#: ../glade/optionswindow.glade.h:19
-msgid "Disable all networking"
-msgstr "Disable all networking"
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr "Save Additional Settings"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: ../data/greeter.ui.h:40
+msgid ""
+"If your Internet connection is 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."
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Language"
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connect directly to the Tor network (default)"
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Locale"
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configure a Tor bridge or local proxy"
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Layout"
+#: ../data/greeter.ui.h:43
+msgid "Disable all networking"
+msgstr "Disable all networking"
+
+#: ../data/greeter.ui.h:44
+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."
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr "Off (default)"
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr "On (default)"
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr "Direct (default)"
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr "_Windows Camouflage"
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy"
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr "Unlockingâ?¦"
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr "Additional Settings"
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr "Add"
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr "Back"
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr "Shutdown"
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr "_Start Tails"
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr "live-persist failed with return code {returncode}:\n{stderr}"
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "cryptsetup failed with return code {returncode}:\n{stdout}\n{stderr}"
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "live-persist failed with return code {returncode}:\n{stdout}\n{stderr}"
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist failed with return code %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Other..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr "umount failed with return code {returncode}:\n{stdout}\n{stderr}"
diff --git a/tg/tg.po b/tg/tg.po
index 3ca3268..f7d1ff2 100644
--- a/tg/tg.po
+++ b/tg/tg.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Tajik (http://www.transifex.com/otf/torproject/language/tg/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/th/th.po b/th/th.po
index 26cc501..f8cb18f 100644
--- a/th/th.po
+++ b/th/th.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-31 06:37+0000\n"
-"Last-Translator: kanesayan gwangsai <thailand.1.2009.00067.77.9@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,170 +21,290 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "à¹?à¸?à¸´à¸?à¸«à¸?à¹?à¸²"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "à¹?à¸?à¹?à¸²à¸ªà¸¹à¹?à¸£à¸°à¸?à¸?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "à¸¢à¸´à¸?à¸?à¸µà¸?à¹?à¸à¸?à¸£à¸±à¸?à¸ªà¸¹à¹? Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "à¸?à¸³à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¸²à¸??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">à¸?à¸¹à¹?à¸¡à¸·à¸à¸?à¸²à¸£à¹?à¸?à¹?à¸?à¸²à¸?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "à¹?à¸?à¹?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "à¹?à¸¡à¹?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "à¸à¹?à¸²à¸?à¸à¸¢à¹?à¸²à¸?à¹?à¸?à¸µà¸¢à¸§à¹?à¸?à¹?à¸²à¸?à¸±à¹?à¸??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>à¸§à¸¥à¸µà¸?à¹?à¸²à¸?à¸?à¸´à¸? à¸¥à¸à¸?à¸à¸µà¸?à¸?à¸£à¸±à¹?à¸?</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "à¸?à¸±à¸§à¹?à¸¥à¸·à¸à¸?à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?à¹?à¸?à¸·à¹?à¸à¸?à¸²à¸£à¸?à¸¹à¹?à¸¥à¸£à¸°à¸?à¸?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "à¹?à¸?à¹?à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?à¹?à¸?à¸·à¹?à¸à¸?à¸²à¸£à¸?à¸¹à¹?à¸¥à¸£à¸°à¸?à¸?à¹?à¸?à¸?à¸£à¸?à¸µà¸?à¸µà¹?à¸?à¸¸à¸?à¸?à¹?à¸à¸?à¸?à¸²à¸£à¸?à¸³à¸?à¸²à¸?à¸?à¸¹à¹?à¸¥à¸£à¸°à¸?à¸? à¹?à¸?à¸?à¸£à¸?à¸µà¸à¸·à¹?à¸?à¸¡à¸±à¸?à¸?à¸°à¸?à¸¹à¸?à¸?à¸´à¸?à¹?à¸?à¹?à¹?à¸?à¸·à¹?à¸à¹?à¸«à¹?à¸?à¸¥à¸à¸?à¸ à¸±à¸¢à¸¡à¸²à¸?à¸?à¸¶à¹?à¸?"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "à¸¢à¸·à¸?à¸¢à¸±à¸?à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>à¸£à¸«à¸±à¸ªà¸?à¹?à¸²à¸?à¹?à¸¡à¹?à¸?à¸£à¸?à¸?à¸±à¸?</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "à¸ à¸²à¸©à¸²"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "à¹?à¸¥à¹?à¸?à¸¥"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "à¹?à¸?à¸£à¸?à¹?à¸?à¸?"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist à¸¥à¹?à¸¡à¹?à¸«à¸¥à¸§à¸?à¹?à¸§à¸¢à¸£à¸«à¸±à¸ªà¸?à¸à¸?à¸?à¸¥à¸±à¸? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup à¸¥à¹?à¸¡à¹?à¸«à¸¥à¸§à¸?à¹?à¸§à¸¢à¸£à¸«à¸±à¸ªà¸?à¸à¸?à¸?à¸¥à¸±à¸? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist à¸¥à¹?à¸¡à¹?à¸«à¸¥à¸§à¸?à¹?à¸§à¸¢à¸£à¸«à¸±à¸ªà¸?à¸à¸?à¸?à¸¥à¸±à¸? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "à¸à¸·à¹?à¸?à¹?..."
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ti/ti.po b/ti/ti.po
index 3f543d4..a61446a 100644
--- a/ti/ti.po
+++ b/ti/ti.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ti\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/tk/tk.po b/tk/tk.po
index 7a0c434..729f4b7 100644
--- a/tk/tk.po
+++ b/tk/tk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Turkmen (http://www.transifex.com/otf/torproject/language/tk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: tk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/tr/tr.po b/tr/tr.po
index f7ba690..b5716e9 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -5,7 +5,7 @@
 # Translators:
 # sgtpepper <barlasmirc@xxxxxxxxx>, 2013
 # Bullgeschichte <bullgeschichte@xxxxxxxxxx>, 2015
-# Caner BaÅ?aran <basaran.caner@xxxxxxxxx>, 2013
+# Caner BaÅ?aran <basaran.caner@xxxxxxxxxxxxxx>, 2013
 # cmldrs, 2014
 # cmldrs, 2014
 # Kaya Zeren <kayazeren@xxxxxxxxx>, 2015
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-11-20 09:35+0000\n"
-"Last-Translator: Volkan Gezer <volkangezer@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,170 +28,290 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ä°leri"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Oturum aÃ§"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Tails'e HoÅ? Geldiniz"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "KalÄ±cÄ±lÄ±k kullanÄ±lsÄ±n mÄ±?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Belgeler</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Evet"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "HayÄ±r"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Parola ifadesi:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Salt okunur mu?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Parola ifadesi hatalÄ±. LÃ¼tfen yeniden deneyin.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "DiÄ?er seÃ§enekler?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "YÃ¶netim parolasÄ±"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.tr.html\">Belgeler</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Bilgisayarda yÃ¶netim gÃ¶revleri gerÃ§ekleÅ?tirecekseniz, bir yÃ¶netim parolasÄ± yazÄ±n. Yoksa gÃ¼venlik iÃ§in devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Parola:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Parola OnayÄ±:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Parola ile onayÄ± eÅ?leÅ?miyor</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC adresi yanÄ±ltma"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.tr.html\">Belgeler</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MAC adreslerini yanÄ±ltmak aÄ? kartlarÄ±nÄ±zÄ±n seri numarasÄ±nÄ± yerel aÄ?lardan gizler. Bu Ã¶zellik coÄ?rafi konumunuzu gizlemenize yardÄ±mcÄ± olabilir."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "MAC adreslerini yanÄ±ltmak genellikle gÃ¼venlidir, ama Å?Ã¼phe uyandÄ±rabilir ya da aÄ? baÄ?lantÄ±sÄ± sorunlarÄ±na neden olabilir."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "TÃ¼m MAC adreslerini yanÄ±ltma"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "AÄ? ayarlarÄ±"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.tr.html\">Belgeler</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Bu bilgisayarÄ±n Ä°nternet baÄ?lantÄ±sÄ±nda herhangi bir engelleme yok. DoÄ?rudan Tor aÄ?Ä±na baÄ?lanmak istiyorsunuz."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Bu bilgisayarÄ±n Ä°nternet baÄ?lantÄ±sÄ± sansÃ¼rleniyor, sÃ¼zÃ¼lÃ¼yor ya da vekil sunucuya baÄ?lÄ±. KÃ¶prÃ¼, gÃ¼venlik duvarÄ± ya da vekil sunucu ayarlarÄ±nÄ± yapmanÄ±z gerekir."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "TÃ¼m aÄ?Ä± devre dÄ±Å?Ä± bÄ±rak"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "Dil"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Yerel ayar"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "DÃ¼zen"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "CanlÄ± tut iÅ?lemi Å?u kod ile tamamlanamadÄ± %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup iÅ?lemi Å?u kod ile tamamlanamadÄ± %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "canlÄ± tut Å?u kodla tamamlanamadÄ±: %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "DiÄ?er..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/tzm/tzm.po b/tzm/tzm.po
index 1307b77..7c7c4e0 100644
--- a/tzm/tzm.po
+++ b/tzm/tzm.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-11 15:05+0100\n"
-"PO-Revision-Date: 2012-10-03 17:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/otf/torproject/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ug@Arab/ug@xxxxxxx b/ug@Arab/ug@xxxxxxx
index 76b6ece..c67d209 100644
--- a/ug@Arab/ug@xxxxxxx
+++ b/ug@Arab/ug@xxxxxxx
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-06-08 07:03+0000\n"
-"Last-Translator: crash x <xmr.crashx@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Uighur (Arabic) (http://www.transifex.com/otf/torproject/language/ug@Arab/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: ug@Arab\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ù?Ø±ØØ¨Ø§ Ø¨Ù? Ù?Ù? ØªØ§Ù?Ù?Ø²"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ù?Ø¹Ù?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ù?Ø§"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ù?Ù?Ù?Ø© Ø§Ù?Ù?Ø±Ù?Ø±"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ø§Ù?Ù?ØºØ©"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/uk/uk.po b/uk/uk.po
index 68a31ee..a1730c4 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -21,170 +21,290 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ð?Ð¿ÐµÑ?ÐµÐ´"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ñ?Ð²Ð°Ñ?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Ð?Ð°Ñ?ÐºÐ°Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ð¼Ð¾ Ñ? Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Ð?Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?Ð¹Ð½Ñ? Ð¿Ð°Ð¼'Ñ?Ñ?Ñ??"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ð¢Ð°Ðº"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ð?Ñ?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ð?Ð»Ñ?Ñ?Ð¾Ð²Ð° Ñ?Ñ?Ð°Ð·Ð°:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Ð¢Ñ?Ð»Ñ?ÐºÐ¸ Ð´Ð»Ñ? Ñ?Ð¸Ñ?Ð°Ð½Ð½Ñ??"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Ð?ÐµÐ¿Ñ?Ð°Ð²Ð¸Ð»Ñ?Ð½Ð¸Ð¹ Ð¿Ð°Ñ?Ð¾Ð»Ñ?. Ð¡Ð¿Ñ?Ð¾Ð±Ñ?Ð¹Ñ?Ðµ Ð·Ð½Ð¾Ð²Ñ?.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ð?Ñ?Ð»Ñ?Ñ?Ðµ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ñ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Ð?Ð²ÐµÐ´Ñ?Ñ?Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ð´Ð»Ñ? Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?.\nÐ£ Ð¿Ñ?Ð¾Ñ?Ð¸Ð»ÐµÐ¶Ð½Ð¾Ð¼Ñ? Ð²Ð¸Ð¿Ð°Ð´ÐºÑ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð±Ñ?Ð´Ðµ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾ Ð² Ñ?Ñ?Ð»Ñ?Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Ð?Ð°Ñ?Ð¾Ð»Ñ?"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ð°Ñ?Ð¾Ð»Ñ?"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð½Ðµ Ð·Ð±Ñ?Ð³Ð°Ñ?Ñ?Ñ?Ñ?Ñ?</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¹Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ? Ð²Ð°Ñ?Ð¾Ñ? Ð¼ÐµÑ?ÐµÐ¶ÐµÐ²Ð¾Ñ? ÐºÐ°Ñ?Ñ?Ð¸ Ð²Ñ?Ð´ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ?. Ð¦Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ð¸ Ð²Ð°Ñ?Ðµ Ð³ÐµÐ¾Ð³Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ðµ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ?."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "Ð¯Ðº Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾, Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ñ?Ð´Ð¼Ñ?Ð½Ñ? MAC-Ð°Ð´Ñ?ÐµÑ? Ð±ÐµÐ·Ð¿ÐµÑ?Ð½Ñ?Ñ?Ðµ, Ð°Ð»Ðµ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ?Ð¸ Ð¿Ñ?Ð´Ð¾Ð·Ñ?Ð¸ Ð°Ð±Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð· Ð¼ÐµÑ?ÐµÐ¶ÐµÐ²Ð¸Ð¼ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ?Ð¼."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° Ð²Ñ?Ñ?Ñ? MAC-Ð°Ð´Ñ?ÐµÑ?"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð¼ÐµÑ?ÐµÐ¶Ñ?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Ð?Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð°Ñ?Ñ?Ñ?</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Ð?ÐµÑ?ÐµÐ¶ÐµÐ²Ðµ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'Ñ?Ñ?ÐµÑ?Ð° Ð²Ñ?Ð»Ñ?Ð½Ðµ Ð²Ñ?Ð´ Ð¿ÐµÑ?ÐµÑ?ÐºÐ¾Ð´. Ð?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð·'Ñ?Ð´Ð½Ð°Ñ?Ð¸Ñ?Ñ? Ð· Ð¼ÐµÑ?ÐµÐ¶ÐµÑ? Tor Ð±ÐµÐ·Ð¿Ð¾Ñ?ÐµÑ?ÐµÐ´Ð½Ñ?Ð¾."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ð²Ñ?Ñ? Ð·'Ñ?Ð´Ð°Ð½Ð½Ñ?"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ð?Ð¾Ð²Ð°"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Ð?Ñ?Ñ?Ñ?Ðµ"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Ð¡Ñ?ÐµÐ¼Ð°"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist Ð½Ðµ Ñ?Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð², ÐºÐ¾Ð´ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cryptsetup Ð½Ðµ Ñ?Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð², ÐºÐ¾Ð´ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist Ð½Ðµ Ñ?Ð¿Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð², ÐºÐ¾Ð´ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "Ð?Ð½Ñ?Ðµ..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/ur/ur.po b/ur/ur.po
index b83af0d..9946496 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
-"PO-Revision-Date: 2016-08-25 07:46+0000\n"
-"Last-Translator: Muhammad Sohaib Raza <sohaibraza000@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ø¢Ú¯Û?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ø¬Û? Û?Ø§Úº"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ù?Û?Û?Úº"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ù?Ø²Û?Ø¯ Ø§Ø®ØªÛ?Ø§Ø±Ø§ØªØ?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ur_PK/ur_PK.po b/ur_PK/ur_PK.po
index e1f5f3a..71f3468 100644
--- a/ur_PK/ur_PK.po
+++ b/ur_PK/ur_PK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/otf/torproject/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Ø¢Ú¯Û? Ø¨Ú?Ú¾Ø§Ø¦Û?Û?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ù?Ø§Ú¯ Ø§Ù?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Û?Ø§Úº"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Ù?Û?Û?Úº"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Ù?Ø²Û?Ø¯ Ø¢Ù¾Ø´Ù?Ø²Ø?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Ø²Ø¨Ø§Ù?"
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/uz/uz.po b/uz/uz.po
index 1415a79..fcf3284 100644
--- a/uz/uz.po
+++ b/uz/uz.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-03-21 16:27+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -18,170 +18,290 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Ha"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "Yo'q"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
+
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
+
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Maxfiy so'z:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "Til"
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/ve/ve.po b/ve/ve.po
index 157c3af..fcd0d3a 100644
--- a/ve/ve.po
+++ b/ve/ve.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Venda (http://www.transifex.com/otf/torproject/language/ve/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/vi/vi.po b/vi/vi.po
index 0a17222..b8b841c 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-10-01 03:17+0000\n"
-"Last-Translator: Khanh Nguyen <nguyenduykhanh85@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,170 +19,290 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "Chuyá»?n tiáº¿p"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "Ä?Ä?ng nháºp"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "ChÃ o má»«ng Ä?áº¿n vá»?i Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Sá» dá»¥ng vÃ¹ng bá»?n vá»¯ng?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">TÃ i liá»?u</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "CÃ³"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "KhÃ´ng"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "Ä?oáº¡n máºt kháº©u:"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "Chá»? Ä?á»?c?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Sai Ä?oáº¡n máºt kháº©u. Vui lÃ²ng thá» láº¡i.</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "ThÃªm tÃ¹y chá»?n?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Máºt kháº©u quáº£n trá»?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "Nháºp má»?t máºt kháº©u quáº£n trá»? trong trÆ°á»?ng há»£p báº¡n cáº§n thá»±c hiá»?n cÃ¡c tÃ¡c vá»¥ quáº£n trá»?\nNáº¿u khÃ´ng nÃ³ cÃ³ thá»? bá»? vÃ´ hiá»?u Ä?á»? an ninh hÆ¡n."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Máºt kháº©u:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "XÃ¡c minh máºt kháº©u:"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Máºt kháº©u khÃ´ng Ä?Ãºng</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "Ä?ang giáº£ Ä?á»?a chá»? MAC"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">TÃ i liá»?u</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "Viá»?c giáº£ Ä?á»?a chá»? MAC áº©n chuá»?i sá»? cá»§a card máº¡ng cá»§a báº¡n Ä?á»?i vá»?i máº¡ng ná»?i bá»?. Viá»?c nÃ y cÃ³ thá»? giÃºp báº¡n áº©n vá»? trÃ Ä?á»?a lÃ½."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ThÆ°á»?ng thÃ¬ sáº½ an toÃ n hÆ¡n náº¿u giáº£ Ä?á»?a chá»? MAC, nhÆ°ng nÃ³ cÅ©ng gÃ¢y ra sá»± nghi ngá»? hoáº·c gÃ¢y nÃªn váº¥n Ä?á»? vá»? káº¿t ná»?i máº¡ng lÆ°á»?i."
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "Giáº£ táº¥t cáº£ cÃ¡c Ä?á»?a chá»? MAC"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "Cáº¥u hÃ¬nh máº¡ng lÆ°á»?i"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">TÃ i liá»?u</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "Viá»?c káº¿t ná»?i Internet cá»§a mÃ¡y tÃnh nÃ y Ä?Ã£ háº¿t sáº¡ch nhá»¯ng chÆ°á»?ng ngáº¡i. Báº¡n muá»?n káº¿t ná»?i trá»±c tiáº¿p tá»?i máº¡ng lÆ°á»?i Tor."
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-msgstr "Viá»?c káº¿t ná»?i Internet cá»§a mÃ¡y tÃnh nÃ y bá»? kiá»?m duyá»?t, lá»?c, hoáº·c thay tháº¿. Báº¡n cáº§n pháº£i cáº¥u hÃ¬nh cáº§u ná»?i, tÆ°á»?ng lá»a hoáº·c cÃ¡c cÃ i Ä?áº·t thay tháº¿."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "VÃ´ hiá»?u táº¥t cáº£ máº¡ng lÆ°á»?i"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "NgÃ´n ngá»¯"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "NÆ¡i xáº£y ra"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "Ná»?n"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist tháº¥t báº¡i vá»?i mÃ£ tráº£ láº¡i %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "cyptsetup tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "KhÃ¡c..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/wa/wa.po b/wa/wa.po
index cd02d5d..feb4e31 100644
--- a/wa/wa.po
+++ b/wa/wa.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Walloon (http://www.transifex.com/otf/torproject/language/wa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: wa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/wo/wo.po b/wo/wo.po
index 40bc42d..c22bc19 100644
--- a/wo/wo.po
+++ b/wo/wo.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Wolof (http://www.transifex.com/otf/torproject/language/wo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: wo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 4a0d091..d43c343 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Chi-Hsun Tsai <chihsun.tsai@xxxxxxxxx>, 2017
+# Chi-Hsun Tsai, 2017
 # ihints <inactive+ihints@xxxxxxxxxxxxx>, 2014
 # khi, 2013
 # khi, 2013
@@ -20,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-12 13:32+0100\n"
-"PO-Revision-Date: 2017-03-16 01:52+0000\n"
-"Last-Translator: Chi-Hsun Tsai <chihsun.tsai@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,170 +30,290 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "å??è¿?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ç?»å½?"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "æ¬¢è¿?è¿?å?¥ Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ä½¿ç?¨æ??ä¹?ä¿?å?å·¥ä½?æ?°æ?®ï¼?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "æ?¯"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "å?¦"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "å¯?è¯ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "å?¯è¯»ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>å¯?è¯é??è¯¯ï¼?è¯·å??æ¬¡å°?è¯?</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "æ?´å¤?é??é¡¹ï¼?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ç®¡ç??å??å¯?ç ?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">æ??æ¡£</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "è?¥é??ä½¿ç?¨äº?ç®¡ç??å??ä»»å?¡ï¼?å?¨æ¤è¾?å?¥ç®¡ç??å??å¯?ç ?ã??å?¦å??å°?å? å®?å?¨ä¿?æ?¤è??ç¦?ç?¨ã??"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "å¯?ç ?ï¼?"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ç¡®è®¤å¯?ç ?ï¼?"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>å¯?ç ?ä¸?æ£ç¡®</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MAC å?°å??æ¬ºéª?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">æ??æ¡£</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "æ¬ºéª? MAC å?°å??ï¼?é??å?¿æ?¨ç??ç½?å?¡å?°æ?¬å?°ç½?ç»?ç??åº?å??å?·ã??è¿?å?¯ä»¥å¸®å?©æ?¨é??è??è?ªå·±ç??å?°ç??ä½?ç½®ã??"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "æ¬ºéª? MAC å?°å??é??å¸¸é?½æ?¯å®?å?¨ç??ï¼?ä½?ä¹?å?å?¨å¼?å??æ??å¯¼è?´ç½?ç»?è¿?é??é?®é¢?ç??å?¯è?½ã??è¯·å??é??æ??æ¡£ã??"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "æ¬ºéª?æ??æ?? MAC å?°å??"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ç½?ç»?è®¾ç½®"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">æ??æ¡£</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "è¯¥ç?µè??ç??è¿?æ?¥æ??é??å·²æ??é?¤ï¼?æ?¨å?¯ä»¥ç?´æ?¥è¿?æ?¥Torç½?ç»?ã??"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ç¦?ç?¨æ??æ??ç½?ç»?"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "è¯è¨?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "å?°å?º"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "å¸?å±?"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "è´?è´£æ??ä¹?å?¨å?è®¾ç½®ç?? live-persist æ?§è¡?å¤±è´¥ï¼?è¿?å??ä»£ç ? %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "å? å¯?è®¾ç½®å¤±è´¥ï¼?è¿?å??ä»£ç ? %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "è´?è´£æ??ä¹?å?¨å?è®¾ç½®ç?? live-persist æ?§è¡?å¤±è´¥ï¼?ï¼?è¿?å??ä»£ç ? %(returncode)s:\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "å?¶ä»?..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 7ccb00c..b60f4a0 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -4,21 +4,21 @@
 # 
 # Translators:
 # brendanyan <yan.brendan@xxxxxxxxx>, 2014
-# CasperLi_HK <casper.hk@xxxxxxxxxxx>, 2013
+# Casper Li <casper.hk@xxxxxxxxxxx>, 2013
 # Christian Chung <alphachungys@xxxxxxxxx>, 2016
-# æ´?è?¥å??, 2016
-# CasperLi_HK <casper.hk@xxxxxxxxxxx>, 2013
+# å¤§å??æ´?è?¥, 2016
+# Casper Li <casper.hk@xxxxxxxxxxx>, 2013
 # ronnietse <tseronnie@xxxxxxxxx>, 2014
 # ronnietse <tseronnie@xxxxxxxxx>, 2014
 # brendanyan <yan.brendan@xxxxxxxxx>, 2014
-# æ´?è?¥å??, 2016
+# å¤§å??æ´?è?¥, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-29 14:32+0100\n"
-"PO-Revision-Date: 2016-04-15 03:23+0000\n"
-"Last-Translator: æ´?è?¥å??\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,170 +26,290 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ä¸?ä¸?æ¥"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ç?»å?¥"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "æ¡è¿?å??å?°Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ä½¿ç?¨æ??çº?æ?§ï¼?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">æ??ä»¶</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "æ?¯"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "å?¦"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "é??é??å?¥èª?ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "å?¯è®?ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>å¯?ç¢¼é?¯èª¤ã??è«?å??è©¦ä¸?æ¬¡ã??</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "æ?´å¤?é?¸é ?ï¼?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ç®¡ç??å?¡å¯?ç¢¼"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">æ??ä»¶</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "é??è¦?å?·è¡?ç®¡ç??ä»»å??ï¼?è«?è¼¸å?¥ç®¡ç??å?¡å¯?ç¢¼ã??\næ?¥å¸¸æ??æ³?ä¸?æ??å¥½å??ç?¨ç®¡ç??å?¡æ¬?é??ï¼?ä»¥å??å¾?æ?´ä½³å??å®?å?¨åº¦ã??"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "å¯?ç¢¼ï¼?"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ç¢ºèª?å¯?ç¢¼ï¼?"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>å¯?ç¢¼å??ç?¸ç¬¦</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "MACä½?å??å?½è£?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">æ??ä»¶</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "MACä½?å??å?½è£?å?¯ä»¥æ?¼å??å??ç¶²çµ¡ä¸é?±è??ä½ å??ç¶²çµ¡å?åº?è??ï¼?ä»¥å?©ä½ é?±è??å?°ç??ä½?ç½®ã??"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ä¸?è?¬å??è¬?MACä½?å??å?½è£?ä¿?å®?å?¨å??ï¼?ä½?ä½¢ä¹?å?¯è?½æ??å¼?èµ·æ?·ç??æ??å°?è?´ç¶²çµ¡é?£ç·?å??é¡?ã??"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "å?½è£?å?¨é?¨MACä½?å??"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ç¶²çµ¡è¨å®?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">æ??ä»¶</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "å?¢é?¨é?»è?¦å??ç¶²çµ¡é?£æ?¥æ²?æ??ä»»ä½?é??ç¤?ã??ä½ æ??æ?³ç?´æ?¥é?£æ?¥Toræ´?è?¥è·¯ç?±ç¶²çµ¡ã??"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "å??ç?¨å?¨é?¨ç¶²çµ¡"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
-msgstr "èª?è¨?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "å?°å??è¨å®?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ç??é?¢ä½?ç½®"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persistå¤±æ??ï¼?å?³å??é?¯èª¤ä»£ç¢¼%(returncode)sï¼?\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "è¨å®?å¯?ç¢¼å¤±æ??ï¼?å?³å??ä»£ç¢¼%(returncode)sï¼?\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persistå¤±æ??ï¼?å?³å??é?¯èª¤ä»£ç¢¼%(returncode)sï¼?\n%(stdout)s\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
-msgstr "å?¶ä»?â?¦"
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 4b9a7d4..a1a8976 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 14:43+0200\n"
-"PO-Revision-Date: 2016-12-21 05:27+0000\n"
-"Last-Translator: AgustÃn Wu <losangwuyts@xxxxxxxxx>\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,170 +24,290 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
-msgstr "ä¸?ä¸?é ?"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
-msgstr "ç?»å?¥"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "æ¡è¿?ä½¿ç?¨ Tails"
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "ä½¿ç?¨æ??çº?æ?§?"
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">æ??ä»¶</a>"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "æ?¯"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
-msgstr "å?¦"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
-msgstr "é??é??å¯?èª?ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
-msgstr "å?¯è®?ï¼?"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>é??é??å¯?èª?é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡</i>"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
+msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "æ?´å¤?é?¸é ?ï¼?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "ç³»çµ±ç®¡ç??å¯?ç¢¼"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">æ??ä»¶</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
-msgstr "å¦?æ??æ?¨é??è¦?å?·è¡?ç³»çµ±ç®¡ç??å·¥ä½?æ??è«?è¼¸å?¥ç³»çµ±ç®¡ç??å?¡å¯?ç¢¼ã??\nå?¦å??æ??å? å®?å?¨è??é??è??è¢«å??ç?¨ã??"
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+msgstr ""
+
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "å¯?ç¢¼ï¼?"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "ç¢ºèª?å¯?ç¢¼ï¼?"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>å¯?ç¢¼ä¸?ç¬¦</i>"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
-msgstr "ç¶²è·¯å?¡å¯¦é«?ä½?å??å?½è£?"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">æ??ä»¶</a>"
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
-msgstr "ç¶²è·¯å?¡å¯¦é«?ä½?å??å?½è£?å??è?½å?¯ä»¥å?¨å??å??ç¶²è·¯ä¸é?±è??æ?¨ç??ç¶²è·¯å?¡åº?è??ï¼?é??å?¯ä»¥å¹«å?©æ?¨é?±è??æ?¨æ??å?¨ç??å?°ç??ä½?ç½®ã??"
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
-msgstr "ä¸?è?¬ä¾?èªªå?½è£?ç¶²è·¯å?¡å¯¦é«?ä½?å??æ?¯æ¯?è¼?å®?å?¨ç??ï¼?ä½?å®?ä¹?å?¯è?½æ??å¼?èµ·æ?·ç??æ??å°?è?´ç¶²è·¯é?£ç·?å?ºå??é¡?ã??"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
-msgstr "å?½è£?æ??æ??ç??ç¶²è·¯å?¡å¯¦é«?ä½?å??"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
-msgstr "ç¶²è·¯è¨å®?"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">æ??ä»¶</a>"
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
-msgstr "æ¤é?»è?¦ç??ç¶²è·¯é?£ç·?å¾?é??æ?¢ï¼?æ?¨æ??è¨±æ??æ?³è¦?ç?´æ?¥é?£ç·?å?°æ´?è?¥è·¯ç?±ç¶²è·¯ã??"
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
+msgstr ""
+
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
-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."
+msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "å??ç?¨æ??æ??ç¶²è·¯"
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
-msgstr " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
-msgid "Language"
-msgstr "èª?è¨?"
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "èª?ç³»è¨å®?"
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
-msgstr "ç??é?¢é??ç½®"
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
+msgstr ""
+
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
-msgstr "live-persist å¤±æ??ä¸¦å?³å??é?¯èª¤ä»£ç¢¼ %(returncode)s:\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
+msgid ""
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "å? å¯?è¨å®?å¤±æ??ï¼?å?³å??ä»£ç¢¼ %(returncode)s:\n%(stdout)s\n%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
-msgstr "live-persist å¤±æ??ä¸¦å?³å??é?¯èª¤ä»£ç¢¼ %(returncode)s:â??\n%(stdout)sâ??\n%(stderr)s"
-
-#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
-#: ../tailsgreeter/langpanel.py:202
-msgid "Other..."
-msgstr "å?¶ä»?..."
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
diff --git a/zu/zu.po b/zu/zu.po
index ee3819c..609fc85 100644
--- a/zu/zu.po
+++ b/zu/zu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+0000\n"
+"POT-Creation-Date: 2017-06-10 08:28+0200\n"
+"PO-Revision-Date: 2017-06-10 10:19+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Zulu (http://www.transifex.com/otf/torproject/language/zu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,170 +17,290 @@ msgstr ""
 "Language: zu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+#: ../data/greeter.ui.h:1
+msgid "Administration Password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../data/greeter.ui.h:2
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../data/greeter.ui.h:3
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../data/greeter.ui.h:4
+msgid "Confirm"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../data/greeter.ui.h:5
+msgid "Confirm your administration password"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../data/greeter.ui.h:6
+msgid "Disable"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
+msgid "Windows Camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
+msgid ""
+"This option makes Tails look like Microsoft Windows 10. This can be useful "
+"to avoid attracting suspicion in public places."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
+msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+#: ../data/greeter.ui.h:13
+msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+#: ../data/greeter.ui.h:14
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../data/greeter.ui.h:15
+msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+#: ../data/greeter.ui.h:16
+msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532
+msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:4
+#: ../data/greeter.ui.h:18
 msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../data/greeter.ui.h:19
+msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:5
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:21
+msgctxt ""
 msgid ""
-"Enter an administration password in case you need to perform administration tasks.\n"
-"Otherwise it will be disabled for better security."
+"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../data/greeter.ui.h:22
+msgid "Language & Region"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../data/greeter.ui.h:23
+msgid "Default Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../data/greeter.ui.h:24
+msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:10
-msgid "MAC address spoofing"
+#: ../data/greeter.ui.h:25
+msgid "_Language"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:11
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:26
+msgid "_Keyboard Layout"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:12
-msgid ""
-"Spoofing MAC addresses hides the serial number of your network cards to the "
-"local networks. This can help you hide your geographical location."
+#: ../data/greeter.ui.h:27
+msgid "_Formats"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:13
-msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+#: ../data/greeter.ui.h:28
+msgid "_Time Zone"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:14
-msgid "Spoof all MAC addresses"
+#: ../data/greeter.ui.h:29
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:15
-msgid "Network configuration"
+#: ../data/greeter.ui.h:30
+msgid "Show Passphrase"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:16
-msgid ""
-"<a "
-"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+#: ../data/greeter.ui.h:31
+msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:17
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to"
-" connect directly to the Tor network."
+#: ../data/greeter.ui.h:32
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478
+#: ../tailsgreeter/gui.py:528
+msgid "Unlock"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:18
+#: ../data/greeter.ui.h:34
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:37
+msgid "Save Additional Settings"
+msgstr ""
+
+#: ../data/greeter.ui.h:38
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../data/greeter.ui.h:39
+msgid "Network Configuration"
+msgstr ""
+
+#: ../data/greeter.ui.h:40
 msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../data/greeter.ui.h:41
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:42
+msgid "Configure a Tor bridge or local proxy"
 msgstr ""
 
-#: ../glade/optionswindow.glade.h:19
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:1
-msgid " "
+#: ../data/greeter.ui.h:44
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
+#: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
+msgid "Off (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385
+msgid "Direct (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:391
+msgid "Bridge & Proxy"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:397
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:499
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:594
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:602
+msgid "Cancel"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:608
+msgid "Add"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:616
+msgid "Back"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
-msgid "Language"
+#: ../tailsgreeter/gui.py:730
+msgid "Shutdown"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+#: ../tailsgreeter/gui.py:735
+msgid "_Start Tails"
 msgstr ""
 
-#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+#. Translators: please do not translate this string (it is read from
+#. Gtk translation)
+#: ../tailsgreeter/language.py:133
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:59
-#, python-format
+#: ../tailsgreeter/persistence.py:89
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:99
-#, python-format
+#: ../tailsgreeter/persistence.py:122 ../tailsgreeter/persistence.py:139
+#, python-brace-format
 msgid ""
-"cryptsetup failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"cryptsetup failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:124
-#, python-format
+#: ../tailsgreeter/persistence.py:156
+#, python-brace-format
 msgid ""
-"live-persist failed with return code %(returncode)s:\n"
-"%(stdout)s\n"
-"%(stderr)s"
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
-msgid "Other..."
+#: ../tailsgreeter/persistence.py:170
+#, python-brace-format
+msgid ""
+"umount failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
 msgstr ""

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

Prev by Author: [tor-commits] [translation/tails-perl5lib] Update translations for tails-perl5lib
Next by Author: [tor-commits] [translation/tails-iuk] Update translations for tails-iuk
Previous by thread: [tor-commits] [translation/tails-greeter] Update translations for tails-greeter
Next by thread: [tor-commits] [translation/tails-greeter] Update translations for tails-greeter
Index(es):
- Author
- Thread