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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2
From: translation@xxxxxxxxxxxxxx
Date: Wed, 1 Feb 2017 08:49:25 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 01 Feb 2017 03:50:29 -0500
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 13cf607b7503ebdfd1badaeb35236321f99347fe
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Wed Feb 1 08:49:22 2017 +0000

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

diff --git a/ach/ach.po b/ach/ach.po
index 0f72ef9..a7196b1 100644
--- a/ach/ach.po
+++ b/ach/ach.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Acoli (https://www.transifex.com/otf/teams/1519/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ady/ady.po b/ady/ady.po
index 7623412..702653b 100644
--- a/ady/ady.po
+++ b/ady/ady.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Adyghe (https://www.transifex.com/otf/teams/1519/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/af/af.po b/af/af.po
index 8129142..ee276a2 100644
--- a/af/af.po
+++ b/af/af.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Afrikaans (https://www.transifex.com/otf/teams/1519/af/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Kanselleer"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Kanselleer"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ak/ak.po b/ak/ak.po
index 956f09d..b7c93f6 100644
--- a/ak/ak.po
+++ b/ak/ak.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Akan (https://www.transifex.com/otf/teams/1519/ak/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/am/am.po b/am/am.po
index f817a61..0f790c5 100644
--- a/am/am.po
+++ b/am/am.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Eyob Fitwi <eyob.fitwi@xxxxxxxxx>, 2016\n"
 "Language-Team: Amharic (https://www.transifex.com/otf/teams/1519/am/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "á??á??"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "á?á??á?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "á?á??á?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "á??á??"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ar/ar.po b/ar/ar.po
index 8343557..6da7f58 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yassmin Alkhatib <yaso95@xxxxxxxxx>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ø§Ù?Ù?ØºÙ?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ø¹Ø·Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ø´Ø¨Ù?Ø§Øª"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ø£ØºÙ?Ù? Ø§Ù?Ù?ØªØµÙ?Ø"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ø¥Ù?ØºØ§Ø¡"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ø¥Ø¶Ø§Ù?Ø©"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Ø±Ø¬Ù?Ø¹"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ø£ØºÙ?Ù? Ø§Ù?Ù?ØªØµÙ?Ø"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/arn/arn.po b/arn/arn.po
index 13d59fa..7375daa 100644
--- a/arn/arn.po
+++ b/arn/arn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Mapudungun (https://www.transifex.com/otf/teams/1519/arn/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ast/ast.po b/ast/ast.po
index b0794d3..d71f890 100644
--- a/ast/ast.po
+++ b/ast/ast.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Asturian (https://www.transifex.com/otf/teams/1519/ast/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/az/az.po b/az/az.po
index 534091b..49d253d 100644
--- a/az/az.po
+++ b/az/az.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/otf/teams/1519/az/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ba/ba.po b/ba/ba.po
index 91b5fa5..1b1b790 100644
--- a/ba/ba.po
+++ b/ba/ba.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bashkir (https://www.transifex.com/otf/teams/1519/ba/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/be/be.po b/be/be.po
index 8ab27b2..6fb9acd 100644
--- a/be/be.po
+++ b/be/be.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Belarusian (https://www.transifex.com/otf/teams/1519/be/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ð?Ð¾Ð²Ð°"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð²Ð°Ñ?Ñ?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð²Ð°Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/bg/bg.po b/bg/bg.po
index 2828094..4deba1d 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: alexdimitrov <kvikmen@xxxxxxxxx>, 2016\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n"
@@ -90,12 +90,26 @@ msgstr "Ð?Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ MAC Ð°Ð´Ñ?ÐµÑ?Ð¸ (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±
 msgid "Don't spoof MAC addresses"
 msgstr "Ð?Ðµ Ð¿Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð¹ MAC Ð°Ð´Ñ?ÐµÑ?Ð¸Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÑ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ñ?Ñ?Ñ? Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð°Ñ?Ð° "
+"Ð¿Ð°Ñ?Ð¾Ð»Ð°."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Ð©Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ðµ Tor Ð¼Ð¾Ñ?Ñ? Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¿Ð¾-ÐºÑ?Ñ?Ð½Ð¾ Ñ?Ð»ÐµÐ´ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° "
+"Ñ? Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Ð?Ð¾Ð±Ñ?Ðµ Ð´Ð¾Ñ?Ð»Ð¸ Ð² Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -103,76 +117,80 @@ msgstr ""
 "Ð?Ð° Ð½Ð°Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð¸Ñ? Ð·Ð° Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð½Ð° Tails, Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ <b>Ð Ð°Ð·Ñ?Ð¾Ð´ÐºÐ° Ð·Ð° Ð´Ð¾Ð±Ñ?Ðµ "
 "Ð´Ð¾Ñ?Ð»Ð¸</b> Ð¿Ð¾-Ð³Ð¾Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Ð?Ð·Ð¸Ðº & Ñ?ÐµÐ³Ð¸Ð¾Ð½"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Ð?Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð·Ð° ÐµÐ·Ð¸Ðº & Ñ?ÐµÐ³Ð¸Ð¾Ð½"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ð?Ð·Ð¸Ðº"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ð¸"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ²Ð° Ð·Ð¾Ð½Ð°"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð¾,Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Ð?Ð¾ÐºÐ°Ð¶Ð¸ Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð°"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð° Ð·Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Ð?Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Ð?Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð´Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð´Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -182,19 +200,19 @@ msgstr ""
 " Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ðµ Tor Ð¼Ð¾Ñ?Ñ? Ð¸Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸. Ð?Ð° Ð´Ð° Ñ?Ð°Ð±Ð¾Ñ?Ð¸Ñ?Ðµ Ð¸Ð·Ñ?Ñ?Ð»Ð¾ Ð¾Ñ?Ð»Ð°Ð¹Ð½ Ð¼Ð¾Ð¶Ðµ Ð´Ð°"
 " Ð´ÐµÐ°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð°Ñ?Ðµ Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð¸ Ð²Ñ?Ñ?Ð·ÐºÐ¸."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° Ñ? Tor Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð° (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Ð?Ð°Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Tor Ð¼Ð¾Ñ?Ñ?, Ñ?Ð°Ð¹Ñ?Ñ?Ð¾Ð» Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ð?Ð·ÐºÐ»Ñ?Ñ?Ð¸ Ð²Ñ?Ð¸Ñ?ÐºÐ¸ Ð¼Ñ?ÐµÐ¶Ð¸"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -202,81 +220,63 @@ msgstr ""
 "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð¿Ð¾ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ð° Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¸ Ð² Ð¿Ð¾Ð²ÐµÑ?ÐµÑ?Ð¾ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¸. Ð?Ð° Ð´Ð° Ð·Ð°Ð´Ð°Ð´ÐµÑ?Ðµ"
 " Ñ?Ñ?Ñ?Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ \"+\" Ð±Ñ?Ñ?Ð¾Ð½Ñ?Ñ? Ð¿Ð¾-Ð´Ð¾Ð»Ñ?."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Ð?Ð·ÐºÐ» (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Ð?ÐºÐ» (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ° Ñ? Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð½Ð° (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ð?Ð·ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Ð?Ð¾Ñ?Ñ? & Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ð?Ð·Ð²Ñ?Ð½ Ð»Ð¸Ð½Ð¸Ñ?"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Ð©Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ðµ Tor Ð¼Ð¾Ñ?Ñ? Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¿Ð¾-ÐºÑ?Ñ?Ð½Ð¾ Ñ?Ð»ÐµÐ´ Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð²Ñ?Ñ?Ð·ÐºÐ° "
-"Ñ? Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Ð?ÐºÐ»"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Ð?Ð·ÐºÐ»"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Ð?Ð¾Ñ?Ñ? & Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ð?Ð·ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ð?Ð·Ð²Ñ?Ð½ Ð»Ð¸Ð½Ð¸Ñ?"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÑ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ñ?Ñ?Ñ? Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð°Ñ?Ð° "
-"Ð¿Ð°Ñ?Ð¾Ð»Ð°."
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -285,8 +285,7 @@ msgstr ""
 "live-persist Ð²Ñ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? ÐºÐ¾Ð´ {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -297,7 +296,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/bn/bn.po b/bn/bn.po
index f2c009c..9bf66d6 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Aftabuzzaman ullah <Leemon432@xxxxxxxxx>, 2016\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à¦à¦¾à¦·à¦¾"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "à¦¬à¦¾à¦¤à¦¿à¦²"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "à¦¯à§?à¦?"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "à¦¬à¦¾à¦¤à¦¿à¦²"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "à¦¯à§?à¦?"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po
index 917769b..7163fc4 100644
--- a/bn_BD/bn_BD.po
+++ b/bn_BD/bn_BD.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bengali (Bangladesh) (https://www.transifex.com/otf/teams/1519/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/bn_IN/bn_IN.po b/bn_IN/bn_IN.po
index 39c99dc..910acdb 100644
--- a/bn_IN/bn_IN.po
+++ b/bn_IN/bn_IN.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Bengali (India) (https://www.transifex.com/otf/teams/1519/bn_IN/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/bo/bo.po b/bo/bo.po
index 8325e82..5384eeb 100644
--- a/bo/bo.po
+++ b/bo/bo.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Tibetan (https://www.transifex.com/otf/teams/1519/bo/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/br/br.po b/br/br.po
index 22eb3f1..0346bb4 100644
--- a/br/br.po
+++ b/br/br.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Breton (https://www.transifex.com/otf/teams/1519/br/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "NullaÃ±"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "NullaÃ±"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/brx/brx.po b/brx/brx.po
index f767f39..91fe222 100644
--- a/brx/brx.po
+++ b/brx/brx.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bodo (https://www.transifex.com/otf/teams/1519/brx/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/bs/bs.po b/bs/bs.po
index 176b7a9..cb28074 100644
--- a/bs/bs.po
+++ b/bs/bs.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Bosnian (https://www.transifex.com/otf/teams/1519/bs/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "OtkaÅ¾i"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
-msgstr "Nazad"
-
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
+msgstr "Nazad"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ca/ca.po b/ca/ca.po
index f1dc84e..195f7c7 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: icc <mail@xxxxxxxxxx>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -91,12 +91,24 @@ msgstr "Falsejament de totes les direccions MAC (per defecte)"
 msgid "Don't spoof MAC addresses"
 msgstr "No falsejar les direccions MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "No es pot desbloquejar la memÃ²ria encriptada amb la contrasenya."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"ConfigurarÃ  el pont i el servidor intermedi de Tor, posterior a una connexiÃ³"
+" a la xarxa."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Benvingut a Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,76 +116,80 @@ msgstr ""
 "Per esser guiat als parÃ metres de Tails, faci click a <b>Fer un visita "
 "guiada</b> a dalt."
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Llengua i regiÃ³"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ParÃ metres per defecte"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Desar parÃ metres de llengua i regiÃ³"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Llengua"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "DisposiciÃ³ del teclat"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formats"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Zona horÃ ria"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Emmagatzematge persistent encriptat"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Mostra contrasenya"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "ParÃ metres d'emmagatzemament persistent"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Entrar contrasenya per desbloquejar l'emmagatzemament persistent"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Desbloquejar"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Re-bloquejar l'emmagatzemament persistent"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "ParÃ metres adicionals"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Desar parÃ metres adicionals"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Afegir parÃ metres addicionals"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "ConfiguraciÃ³ de xarxa"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -183,19 +199,19 @@ msgstr ""
 "pot configurar un pont o servidor intermedi Tor. Per treballar fora de "
 "lÃnia, pot deshabilitar totes les xarxes."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Connectat directament a la xarxa Tor (per defecte)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configurar un pont, tallafoc servidor intermedi Tor"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desactiva tota la xarxa"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -203,79 +219,63 @@ msgstr ""
 "Els valors per defecte sÃ³n segurs en la majoria de situacions. Per afegir "
 "una configuraciÃ³ personalitzada, pressionar el botÃ³ \"+\"."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "DesactivaciÃ³ (defecte)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "ActivaciÃ³ (defecte)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "ConnexiÃ³ de xarxa"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Directe (defecte)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Tancar"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Pont i servidor intermedi"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Executar Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Fora de lÃnia"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Error al blocar l'emmagatzemament persistent."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Desbloquejar"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Enrera"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Desbloquejar"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"ConfigurarÃ  el pont i el servidor intermedi de Tor, posterior a una connexiÃ³"
-" a la xarxa."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Activat"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Desactivar"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Error al blocar l'emmagatzemament persistent."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Pont i servidor intermedi"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Tancar"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Fora de lÃnia"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Executar Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "No es pot desbloquejar la memÃ²ria encriptada amb la contrasenya."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -284,8 +284,7 @@ msgstr ""
 "live-persist ha fallat amb el segÃ¼ent codi {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -296,7 +295,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ceb/ceb.po b/ceb/ceb.po
index 2aeecf2..fbdc560 100644
--- a/ceb/ceb.po
+++ b/ceb/ceb.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Cebuano (https://www.transifex.com/otf/teams/1519/ceb/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/cs/cs.po b/cs/cs.po
index b14cbc2..ee3b237 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adam Slovacek <adamslovacek@xxxxxxxxx>, 2016\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ZakÃ¡zat vÅ¡echny sÃtÄ?"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Vypnout"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "PÅ?idat"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "ZpÄ?t"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Vypnout"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/csb/csb.po b/csb/csb.po
index 2bfc15e..85a0ffc 100644
--- a/csb/csb.po
+++ b/csb/csb.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Kashubian (https://www.transifex.com/otf/teams/1519/csb/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/cv/cv.po b/cv/cv.po
index 495c044..42973eb 100644
--- a/cv/cv.po
+++ b/cv/cv.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ð¥Ä?Ð¹Ñ?Ð¸ÐºÐºÐ¸ <rastamaf@xxxxxxxxx>, 2016\n"
 "Language-Team: Chuvash (https://www.transifex.com/otf/teams/1519/cv/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ñ?Ã¿Ð½Ñ?ÐµÑ?"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ñ?Ã¿Ð½Ñ?ÐµÑ?"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/cy/cy.po b/cy/cy.po
index 8e3cd20..717c2ae 100644
--- a/cy/cy.po
+++ b/cy/cy.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/otf/teams/1519/cy/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Iaith"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Diddymu"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "Ychwanegu"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Diddymu"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "Ychwanegu"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/da/da.po b/da/da.po
index f2de326..cdbcdba 100644
--- a/da/da.po
+++ b/da/da.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Caspar Christensen <klovnedukke@xxxxxxxxx>, 2016\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -91,12 +91,24 @@ msgstr "Spoof alle MAC-adresser (standard)"
 msgid "Don't spoof MAC addresses"
 msgstr "Spoof ikke MAC-adresser"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan ikke lÃ¥se krypteret lager op med denne adgangsfrase."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Du vil konfigurerer Tor-broen og lokal proxy senere efter der er oprettet "
+"forbindelse til et netvÃ¦rk."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Velkommen til Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,76 +116,80 @@ msgstr ""
 "Klik pÃ¥ <b>Take a Tour</b> ovenfor, for at blive guidet gennem Tails' "
 "indstillinger"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Sprog og region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Standardindstillinger"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Gem sprog- og regionsindstillinger"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Sprog"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Tastaturlayout"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formater"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Tidszone"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Krypteret vedvarende lager"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Vis adgangsfrase"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Konfigurer vedvarende lager"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Indtast din adgangsfrase for at lÃ¥se det vedvarende lager op"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "LÃ¥s op"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "LÃ¥s vedvarende lager igen"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Yderligere indstillinger"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Gem yderligere indstillinger"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "TilfÃ¸j en yderligere indstilling"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "NetvÃ¦rkskonfiguration"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -183,19 +199,19 @@ msgstr ""
 "konfigurerer en Tor-bro eller en lokal proxy. Du kan deaktivere all netvÃ¦rk "
 "for at arbejde helt offline."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Opret forbindelse direkte til Tor-netvÃ¦rket (standard)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Konfigurer en Tor-bro-, firewall- eller proxyindstillinger"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DeaktivÃ©r alt netvÃ¦rkskommunikation"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -203,79 +219,63 @@ msgstr ""
 "Standardindstillingerne er sikre i de fleste situationer. Tryk pÃ¥ "
 "\"+\"-knappen nedenfor, for at tilfÃ¸je en tilpasset indstilling."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Fra (standard)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Til (standard)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "NetvÃ¦rksforbindelse"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direkte (standard)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Luk ned"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bro og proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Kunne ikke genlÃ¥s vedvarende lagring."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "LÃ¥ser opâ?¦"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Annuller"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "TilfÃ¸j"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Tilbage"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "LÃ¥ser opâ?¦"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Du vil konfigurerer Tor-broen og lokal proxy senere efter der er oprettet "
-"forbindelse til et netvÃ¦rk."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Til"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Fra"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Kunne ikke genlÃ¥s vedvarende lagring."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bro og proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Luk ned"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Frakoblet"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Start Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan ikke lÃ¥se krypteret lager op med denne adgangsfrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -284,8 +284,7 @@ msgstr ""
 "live-persist fejlede med returkode {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -296,7 +295,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/de/de.po b/de/de.po
index 500bc73..5451b02 100644
--- a/de/de.po
+++ b/de/de.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sebastian <sebix+transifex@xxxxxxxx>, 2016\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -91,12 +91,25 @@ msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
 msgid "Don't spoof MAC addresses"
 msgstr "MAC-Adressen nicht manipulieren"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"VerschlÃ¼sselter Speicher kann mit dieser Passphrase nicht entsperrt werden."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Die Tor-BrÃ¼cke und den lokalen Vermittlungsserver (Proxy) spÃ¤ter nach dem "
+"Verbinden mit dem Netzwerk konfigurieren."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Willkommen bei Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,78 +117,82 @@ msgstr ""
 "Um eine FÃ¼hrung durch die Einstellungen von Tails zu erhalten, oben <b>Take "
 "a Tour</b> klicken."
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Sprache & Region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Vorgabeeinstellungen"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Sprache & Regionseinstellungen speichern"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Sprache"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Tastaturbelegung"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formate"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Zeitzone"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "VerschlÃ¼sselte bestÃ¤ndige Datenpartition"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Passphrase anzeigen"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "BestÃ¤ndige Datenpartition konfigurieren"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Geben Sie Ihre Passphrase ein, um die bestÃ¤ndige Datenpartition zu "
 "entsperren"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Entsperren"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "BestÃ¤ndige Datenpartition wieder sperren"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "ZusÃ¤tzliche Einstellungen"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "ZusÃ¤tzliche Einstellungen speichern"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "ZusÃ¤tzliche Einstellung hinzufÃ¼gen"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Netzwerkkonfiguration"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -186,21 +203,21 @@ msgstr ""
 "lokaler Vermittlungsserver konfiguriert werden. Um vollstÃ¤ndig offline zu "
 "arbeiten, kÃ¶nnen die Netzwerkverbindungen zur GÃ¤nze deaktiviert werden."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 "Eine Tor-BrÃ¼cke, Firewall der Vermittlungsservereinstellungen (Proxy) "
 "konfigurieren."
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Alle Netzwerkfunktionen deaktivieren"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -209,80 +226,63 @@ msgstr ""
 "benutzerdefinierte Einstellungen vorzunehmen, drÃ¼cken Sie unten auf die "
 "SchaltflÃ¤che Â»+Â«."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Aus (Vorgabe)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Ein (Vorgabe)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Netzwerkverbindung"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direkt (Vorgabe)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Herunterfahren"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "BrÃ¼cke & Vermittlungsserver"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Tails starten"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "BestÃ¤ndige Datenpartition konnte nicht wieder gesperrt werden."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Wird entsperrt â?¦"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "ZurÃ¼ck"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Wird entsperrt â?¦"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Die Tor-BrÃ¼cke und den lokalen Vermittlungsserver (Proxy) spÃ¤ter nach dem "
-"Verbinden mit dem Netzwerk konfigurieren."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Ein"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Aus"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "BestÃ¤ndige Datenpartition konnte nicht wieder gesperrt werden."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "BrÃ¼cke & Vermittlungsserver"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Herunterfahren"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Tails starten"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"VerschlÃ¼sselter Speicher kann mit dieser Passphrase nicht entsperrt werden."
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -291,8 +291,7 @@ msgstr ""
 "live-persist ist mit Code {returncode} fehlgeschlagen:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -303,7 +302,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/dz/dz.po b/dz/dz.po
index 1499bad..cd6bb1c 100644
--- a/dz/dz.po
+++ b/dz/dz.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Dzongkha (https://www.transifex.com/otf/teams/1519/dz/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/el/el.po b/el/el.po
index a0981d5..c315f45 100644
--- a/el/el.po
+++ b/el/el.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: dpdt1 <dpdt1@xxxxxxxxx>, 2016\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Î?Î»Ï?Ï?Ï?Î± ÎºÎ±Î¹ Ï?ÎµÏ?Î¹Î¿Ï?Î®"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Î?Î»Ï?Ï?Ï?Î±"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Î?Ï?Î½Î· Î?Ï?Î±Ï?"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Î¡Ï?Î¸Î¼Î¹Ï?Î· Î´Î¹ÎºÏ?Ï?Î¿Ï?"
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?Ï?Îµ Ï?Î»Î± Ï?Î± Î´Î¯ÎºÏ?Ï?Î±"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Î?Î»ÎµÎ¯Ï?Î¹Î¼Î¿"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Î?ÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Î?ÎºÏ?Ï?Ï?Ï?Î·"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Î Ï?Î¿Ï?Î¸Î®ÎºÎ·"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Î Î¯Ï?Ï?"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Î?Î»ÎµÎ¯Ï?Î¹Î¼Î¿"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Î?ÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 3a7695f..4865878 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: newharha ehrara <dbybgohg@xxxxxxxxxxx>, 2016\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Language"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Disable all networking"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "Add"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/eo/eo.po b/eo/eo.po
index fef6488..a97bc3c 100644
--- a/eo/eo.po
+++ b/eo/eo.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Arturo Crespo <arthurocrates@xxxxxxxxxxx>, 2017\n"
 "Language-Team: Esperanto (https://www.transifex.com/otf/teams/1519/eo/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Lingvo"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Malfunkciigi Ä?iuj retoj"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "MalantaÅe"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/es/es.po b/es/es.po
index ef6a56a..58a260d 100644
--- a/es/es.po
+++ b/es/es.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: strel <strelnic@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -92,12 +92,24 @@ msgstr "Falsificar todas las direcciones MAC (predeterminado)"
 msgid "Don't spoof MAC addresses"
 msgstr "No falsificar las direcciones MAC "
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"No se puede desbloquear el almacenamiento cifrado con esta contraseÃ±a."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"ConfigurarÃ¡ el puente Tor y el proxy local, despuÃ©s de conectarse a la red."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Â¡Bienvenido a Tails! "
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -105,77 +117,81 @@ msgstr ""
 "Para hacer una visita guiada a la configuraciÃ³n de Tails, pulse <b>Hacer un "
 "recorrido</b> "
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Idioma y regiÃ³n "
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ConfiguraciÃ³n por defecto"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Guardar la configuraciÃ³n regional y de idioma"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "ConfiguraciÃ³n del teclado"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formatos "
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Zona horaria "
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Almacenamiento cifrado permanente"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Mostrar contraseÃ±a"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configurar almacenamiento permanente"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Introduzca su contraseÃ±a para desbloquear el almacenamiento permanente"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Desbloquear "
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Bloquear de nuevo el almacenamiento permanente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Configuraciones adicionales "
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Guardar configuraciones adicionales "
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "AÃ±adir un ajuste adicional"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "ConfiguraciÃ³n de red"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -186,20 +202,20 @@ msgstr ""
 "trabajar completamente desconectado, puede deshabilitar todas las conexiones"
 " de red."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Conectar directamente a la red Tor (predeterminado) "
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 "Configurar los ajustes de un puente de Tor, un cortafuegos o un proxy "
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Deshabilitar todas las conexiones de red "
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -207,79 +223,63 @@ msgstr ""
 "La configuraciÃ³n predeterminada es la mÃ¡s segura la mayorÃa de las veces. "
 "Para aÃ±adir una configuraciÃ³n personalizada, pulse el botÃ³n \"+\"."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Desactivada (predeterminado) "
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Activada (predeterminado) "
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "ConexiÃ³n a la red "
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Directa (predeterminado) "
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Cerrar "
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Puente y proxy "
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Iniciar Tails "
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "No se pudo volver a bloquear el almacenamiento permanente."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Desbloqueando... "
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancelar "
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "AÃ±adir "
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "AtrÃ¡s "
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Desbloqueando... "
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"ConfigurarÃ¡ el puente Tor y el proxy local, despuÃ©s de conectarse a la red."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Activado "
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Desactivado "
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "No se pudo volver a bloquear el almacenamiento permanente."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Puente y proxy "
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Cerrar "
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Desconectado"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Iniciar Tails "
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"No se puede desbloquear el almacenamiento cifrado con esta contraseÃ±a."
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -288,8 +288,7 @@ msgstr ""
 "live-persist fallÃ³ con un cÃ³digo de retorno {returncode}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -300,7 +299,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 76840e1..a2cd8eb 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ezemelano <melanoeze@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Deshabilitar toda forma de conexiÃ³n a redes"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Apagar"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Agrefgar"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "AtrÃ¡s"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Apagar"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/es_CL/es_CL.po b/es_CL/es_CL.po
index 441367a..9fa41a4 100644
--- a/es_CL/es_CL.po
+++ b/es_CL/es_CL.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Francisco Eduardo Espinoza Castro <francisco.fespinoza@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Chile) (https://www.transifex.com/otf/teams/1519/es_CL/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/es_CO/es_CO.po b/es_CO/es_CO.po
index 2a679e7..b4abef6 100644
--- a/es_CO/es_CO.po
+++ b/es_CO/es_CO.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: William BeltrÃ¡n <wbeltranc@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/otf/teams/1519/es_CO/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po
index f14f7da..041c14d 100644
--- a/es_MX/es_MX.po
+++ b/es_MX/es_MX.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sanxcher Motala <motala.sanxcher@xxxxxxxxxx>, 2017\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/otf/teams/1519/es_MX/)\n"
@@ -92,12 +92,22 @@ msgstr "Spoofear todas las direcciones Mac (por defaulto) "
 msgid "Don't spoof MAC addresses"
 msgstr "No falsificar direcciones MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "Bienvenido a Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -105,179 +115,168 @@ msgstr ""
 "Para ser guiado por la configuraciÃ³n de Tails, clickea en <b>Tomar Tur</b> "
 "arriba"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Lenguaje y RegiÃ³n"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ConfiguraciÃ³n Estandar"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Guardar ConfiguraciÃ³n de Lenguaje y Region"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Lenguaje"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "DistribuciÃ³n de Teclado"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formatos"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Zona horaria"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Almacenamiento Codificado Persistente"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Muestra la frase clave"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configurar Almacenamiento Persistente"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Introduce tu fraseclave para abrir el almacenamiento persistente"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Abrir"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Cerrar Almacenamiento Persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Configuracion adicional"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desactivar toda actividad."
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -285,7 +284,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/et/et.po b/et/et.po
index 9f049f6..cc5cdc6 100644
--- a/et/et.po
+++ b/et/et.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: G <purexxxx@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Estonian (https://www.transifex.com/otf/teams/1519/et/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Katkesta"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "Lisa"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Katkesta"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "Lisa"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/eu/eu.po b/eu/eu.po
index e4ad173..7720ad5 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Iban <iban.ferreira@xxxxxxxxx>, 2016\n"
 "Language-Team: Basque (https://www.transifex.com/otf/teams/1519/eu/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ezgaitu konexio guztiak"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Itzali"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Lineaz kanpo"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Atzera"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Itzali"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Lineaz kanpo"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fa/fa.po b/fa/fa.po
index 313e962..e134aad 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: aidin <aidin.eslami@xxxxxxxxx>, 2016\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ø²Ø¨Ø§Ù?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù?Ù?Ù? Ø´Ø¨Ú©Ù? Ù?Ø§"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ø®Ø§Ù?Ù?Ø´ Ú©Ø±Ø¯Ù?"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ø¢Ù?Ù?Ø§Û?Ù?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ù?ØºÙ?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ø§Ù?Ø²Ù?Ø¯Ù?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Back"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ø®Ø§Ù?Ù?Ø´ Ú©Ø±Ø¯Ù?"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ø¢Ù?Ù?Ø§Û?Ù?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fi/fi.po b/fi/fi.po
index 0b8d1fb..daca018 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jaakko Helleranta <jaakko@xxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Finnish (https://www.transifex.com/otf/teams/1519/fi/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Kieli"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Poista kaikki verkkoyhteydet kÃ¤ytÃ¶stÃ¤"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Sammuta"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Poissa verkosta"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "LisÃ¤Ã¤"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Takaisin"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Sammuta"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Poissa verkosta"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fil/fil.po b/fil/fil.po
index 6b7b609..60e666d 100644
--- a/fil/fil.po
+++ b/fil/fil.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jed Aureus Gonzales (AU Gonzales) <gonzales.au@xxxxxxxxx>, 2016\n"
 "Language-Team: Filipino (https://www.transifex.com/otf/teams/1519/fil/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "I-kansela"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Idagdag"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Balik"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fo/fo.po b/fo/fo.po
index 71f15c8..c1a02ce 100644
--- a/fo/fo.po
+++ b/fo/fo.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sigmund JÃ¸rgensen <sigmund@xxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "SlÃ¸kk"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Angra"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "Legg afturat"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Angra"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "Legg afturat"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "SlÃ¸kk"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fr/fr.po b/fr/fr.po
index bc7623b..243e2aa 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mortimer <doug.mortimer@xxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -92,12 +92,25 @@ msgstr "DÃ©guiser toutes les adresses MAC (par dÃ©faut)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ne pas dÃ©guiser les adresses MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"Cette phrase de passe ne permet pas de dÃ©verrouiller le stockage chiffrÃ©."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Vous configurerez le pont Tor et le mandataire local plus tard, aprÃ¨s vous "
+"Ãªtre connectÃ© Ã  un rÃ©seau"
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Bienvenue Ã  Tails !"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -105,77 +118,81 @@ msgstr ""
 "Pour dÃ©couvrir les paramÃ¨tres de Tails, cliquez sur <b>Visite guidÃ©e</b> ci-"
 "dessus"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Langue et rÃ©gion"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ParamÃ¨tres par dÃ©faut"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Enregistrer les paramÃ¨tres de langue et de rÃ©gion"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Langue"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Disposition du clavier"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formats"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Fuseau horaire"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Stockage persistant chiffrÃ©"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Afficher la phrase de passe"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configurer le stockage persistant"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Saisir votre phrase de passe pour dÃ©verrouiller le stockage persistant"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "DÃ©verrouiller"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Reverrouiller le stockage persistant"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "ParamÃ¨tres supplÃ©mentaires"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Enregistrer les paramÃ¨tres supplÃ©mentaires"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Ajouter un paramÃ¨tre supplÃ©mentaire"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Configuration du rÃ©seau"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -185,19 +202,19 @@ msgstr ""
 "mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour "
 "travailler complÃ¨tement hors ligne, vous pouvez dÃ©sactiver le rÃ©seau."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Se connecter directement au rÃ©seau Tor (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configurer un pont Tor, un pare-feu ou les paramÃ¨tres du mandataire"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DÃ©sactiver le rÃ©seau"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -205,80 +222,63 @@ msgstr ""
 "Les paramÃ¨tres par dÃ©faut sont sÃ»rs dans la plupart des cas. Pour ajouter un"
 " paramÃ¨tre personnalisÃ©, appuyer sur le bouton Â« + Â» ci-dessous."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "DÃ©sactivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "ActivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Connexion rÃ©seau"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Directe (par dÃ©faut)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Extinction"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bon et mandataire"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "DÃ©marrer Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Hors ligne"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Ã?chec de reverrouillage du stockage persistant."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "DÃ©verrouillage..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Retour"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "DÃ©verrouillage..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Vous configurerez le pont Tor et le mandataire local plus tard, aprÃ¨s vous "
-"Ãªtre connectÃ© Ã  un rÃ©seau"
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "ActivÃ©"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "DÃ©sactivÃ©"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Ã?chec de reverrouillage du stockage persistant."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bon et mandataire"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Extinction"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Hors ligne"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "DÃ©marrer Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"Cette phrase de passe ne permet pas de dÃ©verrouiller le stockage chiffrÃ©."
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -287,8 +287,7 @@ msgstr ""
 "Ã?chec de live-persist avec le code de retour {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -299,7 +298,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po
index a4429c1..d7b0d3e 100644
--- a/fr_CA/fr_CA.po
+++ b/fr_CA/fr_CA.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: French language coordinator <french.translation@xxxxxxx>, 2016\n"
 "Language-Team: French (Canada) (https://www.transifex.com/otf/teams/1519/fr_CA/)\n"
@@ -92,12 +92,25 @@ msgstr "DÃ©guiser toutes les adresses MAC (par dÃ©faut)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ne pas dÃ©guiser les adresses MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"Cette phrase de passe ne permet pas de dÃ©verrouiller le stockage chiffrÃ©."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Vous configurerez le pont Tor et le mandataire local plus tard, aprÃ¨s vous "
+"Ãªtre connectÃ© Ã  un rÃ©seau"
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Bienvenue Ã  Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -105,77 +118,81 @@ msgstr ""
 "Pour dÃ©couvrir les paramÃ¨tres de Tails, cliquez sur <b>Visite guidÃ©e</b> ci-"
 "dessus"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Langue et rÃ©gion"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ParamÃ¨tres par dÃ©faut"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Enregistrer les paramÃ¨tres de langue et de rÃ©gion"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Langue"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Disposition du clavier"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formats"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Fuseau horaire"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Stockage persistant chiffrÃ©"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Afficher la phrase de passe"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configurer le stockage persistant"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Saisir votre phrase de passe pour dÃ©verrouiller le stockage persistant"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "DÃ©verrouiller"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Reverrouiller le stockage persistant"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "ParamÃ¨tres supplÃ©mentaires"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Enregistrer les paramÃ¨tres supplÃ©mentaires"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Ajouter un paramÃ¨tre supplÃ©mentaire"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Configuration du rÃ©seau"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -185,19 +202,19 @@ msgstr ""
 "mandataire, vous pouvez configurer un pont Tor ou un mandataire local. Pour "
 "travailler complÃ¨tement hors ligne, vous pouvez dÃ©sactiver le rÃ©seau."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Se connecter directement au rÃ©seau Tor (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configurer un pont Tor, un pare-feu ou les paramÃ¨tres du mandataire"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DÃ©sactiver le rÃ©seau"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -205,80 +222,63 @@ msgstr ""
 "Les paramÃ¨tres par dÃ©faut sont sÃ©curitaires dans la plupart des cas. Pour "
 "ajouter un paramÃ¨tre personnalisÃ©, peser sur le bouton Â« + Â» ci-dessous."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "DÃ©sactivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "ActivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Connexion rÃ©seau"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Directe (par dÃ©faut)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Extinction"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bon et mandataire"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "DÃ©marrer Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Hors ligne"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Ã?chec de reverrouillage du stockage persistant."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "DÃ©verrouillage..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Retour"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "DÃ©verrouillage..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Vous configurerez le pont Tor et le mandataire local plus tard, aprÃ¨s vous "
-"Ãªtre connectÃ© Ã  un rÃ©seau"
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "ActivÃ©"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "DÃ©sactivÃ©"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Ã?chec de reverrouillage du stockage persistant."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bon et mandataire"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Extinction"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Hors ligne"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "DÃ©marrer Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"Cette phrase de passe ne permet pas de dÃ©verrouiller le stockage chiffrÃ©."
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -287,8 +287,7 @@ msgstr ""
 "Ã?chec de live-persist avec le code de retour {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -299,7 +298,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fur/fur.po b/fur/fur.po
index 682349e..da7c4f8 100644
--- a/fur/fur.po
+++ b/fur/fur.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Friulian (https://www.transifex.com/otf/teams/1519/fur/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/fy/fy.po b/fy/fy.po
index aa5175d..347d045 100644
--- a/fy/fy.po
+++ b/fy/fy.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robin van der Vliet <info@xxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Western Frisian (https://www.transifex.com/otf/teams/1519/fy/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ofslute"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Annulearje"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Annulearje"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ofslute"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ga/ga.po b/ga/ga.po
index 3382d15..4fa5fb7 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cur ar Ceal"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cur ar Ceal"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/gd/gd.po b/gd/gd.po
index ed855f3..23f0040 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Gaelic, Scottish (https://www.transifex.com/otf/teams/1519/gd/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/gl/gl.po b/gl/gl.po
index 0370519..4558453 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xan VFR <formularios@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Galician (https://www.transifex.com/otf/teams/1519/gl/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Deshabilitar toda conexiÃ³n Ã¡ rede"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Engadir"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "AtrÃ¡s"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Desconectado"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/gu/gu.po b/gu/gu.po
index a1b993f..890677c 100644
--- a/gu/gu.po
+++ b/gu/gu.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "àª¬àª?àª§ àª?àª°à«?"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "àª°àª¦à«? àª?àª°à«?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "àª°àª¦à«? àª?àª°à«?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "àª¬àª?àª§ àª?àª°à«?"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/gu_IN/gu_IN.po b/gu_IN/gu_IN.po
index cd7769b..606fae1 100644
--- a/gu_IN/gu_IN.po
+++ b/gu_IN/gu_IN.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sukhbir Singh <sukhbir.in@xxxxxxxxx>, 2016\n"
 "Language-Team: Gujarati (India) (https://www.transifex.com/otf/teams/1519/gu_IN/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "àª°àª¦ àª?àª°à«?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "àª°àª¦ àª?àª°à«?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/gun/gun.po b/gun/gun.po
index dc70f20..90aed2f 100644
--- a/gun/gun.po
+++ b/gun/gun.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Gun (https://www.transifex.com/otf/teams/1519/gun/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ha/ha.po b/ha/ha.po
index 6ca039a..610d403 100644
--- a/ha/ha.po
+++ b/ha/ha.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Hausa (https://www.transifex.com/otf/teams/1519/ha/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/he/he.po b/he/he.po
index e267ec3..1ce8f33 100644
--- a/he/he.po
+++ b/he/he.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: GenghisKhan <genghiskhan@xxxxxx>, 2016\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "×©×¤×?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "×?×©×?×ª ×?×ª ×?×? ×?×?×ª×?×?×¨×?×?×?×ª ×?×¨×©×ª"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "×?×?×?×?×?"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "×?×? ×?×§×?×?×?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "×?×?×?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "×?×?×¡×£"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "×?×§×?×?×?"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "×?×?×?×?×?"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "×?×? ×?×§×?×?×?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/hi/hi.po b/hi/hi.po
index e6e7131..188a332 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Meghana S <meghana.cse11@xxxxxxxxx>, 2016\n"
 "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à¤à¤¾à¤·à¤¾"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¥?à¤?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "à¤¡à¤¾à¤²à¥?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "à¤µà¤¾à¤ªà¤¸"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/hr/hr.po b/hr/hr.po
index 84c9a01..a3f7644 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "OtkaÅ¾i"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 80109a4..258b473 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ana B <abuljan031@xxxxxxxxx>, 2016\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/otf/teams/1519/hr_HR/)\n"
@@ -89,88 +89,104 @@ msgstr "Maskiraj sve MAC adrese (zadano)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ne maskiraj MAC adrese"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Ne mogu otkljuÄ?ati enkriptiranu pohranu s ovom lozinkom."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Konfigurirat Ä?e te Tor most i lokalni proxy kasnije, nakon spajanja na "
+"mreÅ¾u."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "DobrodoÅ¡li u Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "Da bi Vas proveli kroz Tails postavke, kliknite na <b>Obilazak</b> iznad"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Jezik i regija"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Zadane postavke"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Spremite postavke jezika i regije"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Postavke tipkovnice"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formati"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Vremenska zona"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Enkriptirana trajna pohrana"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "PokaÅ¾i lozinku"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Postavi trajnu pohranu"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Unesite lozinku za otkljuÄ?avanje trajne pohrane"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "OtkljuÄ?aj"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "ZakljuÄ?aj trajnu pohranu"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Dodatne postavke"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Spremi dodatne postavke"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "MreÅ¾na konfiguracija"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -180,19 +196,19 @@ msgstr ""
 "konfigurirati Tor most ili lokalni proxy.  Kako bi radili kompletno offline,"
 " moÅ¾ete onemoguÄ?iti sve mreÅ¾ne radnje."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Spoji se izravno na Tor mreÅ¾u (zadano)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Konfiguriraj postavke Tor mosta, vatrozida ili proxya"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "OnemoguÄ?i sav mreÅ¾ni rad"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -200,79 +216,63 @@ msgstr ""
 "Zadane postavke su sigurne u veÄ?ini situacija. Kako bi dodali prilagoÄ?ene "
 "postavke, stisnite \"+\" gumb."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "IskljuÄ?eno (zadano)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "UkljuÄ?eno (zadano)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "MreÅ¾na veza"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direktno (zadano)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "GaÅ¡enje"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Most i proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Pokreni Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Nije uspjelo zakljuÄ?avanje trajne pohrane."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "OtkljuÄ?avam..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Povratak"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "OtkljuÄ?avam..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Konfigurirat Ä?e te Tor most i lokalni proxy kasnije, nakon spajanja na "
-"mreÅ¾u."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "UkljuÄ?eno"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "IskljuÄ?eno"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Nije uspjelo zakljuÄ?avanje trajne pohrane."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Most i proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "GaÅ¡enje"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Pokreni Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Ne mogu otkljuÄ?ati enkriptiranu pohranu s ovom lozinkom."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -281,8 +281,7 @@ msgstr ""
 "live-persist nije uspio s povratnim kodom {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -293,7 +292,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ht/ht.po b/ht/ht.po
index a5762a8..e302b0c 100644
--- a/ht/ht.po
+++ b/ht/ht.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Haitian (Haitian Creole) (https://www.transifex.com/otf/teams/1519/ht/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/hu/hu.po b/hu/hu.po
index 39cee0b..cd6c54a 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Nyelv"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ã?sszes hÃ¡lÃ³zatÃ©pÃtÃ©s letiltÃ¡sa"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "LeÃ¡llÃtÃ¡s"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "MÃ©gsem"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "HozzÃ¡ad"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Vissza"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "LeÃ¡llÃtÃ¡s"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/hy/hy.po b/hy/hy.po
index d1af158..0eebba6 100644
--- a/hy/hy.po
+++ b/hy/hy.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Armenian (https://www.transifex.com/otf/teams/1519/hy/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ia/ia.po b/ia/ia.po
index 17a1101..11f8340 100644
--- a/ia/ia.po
+++ b/ia/ia.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Funkin <emisepulvedam@xxxxxxxxx>, 2016\n"
 "Language-Team: Interlingua (https://www.transifex.com/otf/teams/1519/ia/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Linguage"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Foras de linea"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Retro"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Foras de linea"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/id/id.po b/id/id.po
index 580ae77..61e1ac0 100644
--- a/id/id.po
+++ b/id/id.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: hpiece 8 <hpiece8@xxxxxxxxx>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Bahasa"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Nonaktifkan semua jaringan"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Matikan"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Luring"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Tambah"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Kembali"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Matikan"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Luring"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/is/is.po b/is/is.po
index c1fb021..5b1a0a2 100644
--- a/is/is.po
+++ b/is/is.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
@@ -91,12 +91,24 @@ msgstr "DulbÃºa Ã¶ll MAC-vistfÃ¶ng (sjÃ¡lfgefiÃ°)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ekki dulbÃºa MAC-vistfÃ¶ng"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Get ekki aflÃ¦st dulritaÃ°ri gagnageymslu meÃ° Ã¾essum lykilfrasa."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Ã?Ãº munt setja upp Tor-brÃº og staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy) sÃÃ°ar eftir aÃ° hafa"
+" tengst neti."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Velkomin Ã Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,76 +116,80 @@ msgstr ""
 "Til aÃ° fÃ¡ leiÃ°sÃ¶gn um stillingar Tails, smelltu Ã¡ <b>Fara Ã skoÃ°unarferÃ°</b>"
 " hÃ©r fyrir ofan"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "TungumÃ¡l og hÃ©raÃ°"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "SjÃ¡lfgefnar stillingar"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Vista tungumÃ¡la- og svÃ¦Ã°isstillingar"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "TungumÃ¡l"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "LyklaborÃ°suppsetning"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "SniÃ°"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "TÃmabelti"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "DulrituÃ° varanleg gagnageymsla"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Birta lykilsetningu"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Stilla varanlega gagnageymslu"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Settu inn lykilfrasann til aÃ° aflÃ¦sa varanlegu gagnageymslunni"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "AflÃ¦sa"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "LÃ¦sa aftur varanlegri gagnageymslu"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Aukastillingar"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Vista aukastillingar"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "BÃ¦ta viÃ° aukastillingum"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Stillingar netkerfis"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -183,19 +199,19 @@ msgstr ""
 "milliÃ¾jÃ³n, Ã¾Ã¡ Ã¦ttir Ã¾Ãº aÃ° stilla Tor-brÃº eÃ°a milliÃ¾jÃ³n. Til aÃ° vinna Ã¡n "
 "nettengingar geturÃ°u gert netvinnslu Ã³virka."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Tengjast beint viÃ° Tor-netiÃ° (sjÃ¡lfgefiÃ°)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Stilla Tor-brÃº, eldvegg, eÃ°a stillingar milliÃ¾jÃ³ns (proxy)"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Afvirkja alla netvinnslu"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -203,79 +219,63 @@ msgstr ""
 "SjÃ¡lfgefnar stillingar eru Ã flestum tilfellum nÃ³gu Ã¶ruggar. Til aÃ° bÃ¦ta viÃ°"
 " sÃ©rsniÃ°num stillingum, Ã½ttu Ã¡ \"+\" hnappinn hÃ©r fyrir neÃ°an."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "SlÃ¶kkt (sjÃ¡lfgefiÃ°)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Kveikt (sjÃ¡lfgefiÃ°)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Netkerfistenging"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Beint (sjÃ¡lfgefiÃ°)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "SlÃ¶kkva"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "BrÃº og milliÃ¾jÃ³nn"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "RÃ¦sa Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ã?nettengt"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "TÃ³kst ekki aÃ° lÃ¦sa aftur varanlegri gagnageymslu."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "AflÃ¦siâ?¦"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "HÃ¦tta viÃ°"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "BÃ¦ta viÃ°"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Til baka"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "AflÃ¦siâ?¦"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Ã?Ãº munt setja upp Tor-brÃº og staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy) sÃÃ°ar eftir aÃ° hafa"
-" tengst neti."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Kveikt"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "SlÃ¶kkt"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "TÃ³kst ekki aÃ° lÃ¦sa aftur varanlegri gagnageymslu."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "BrÃº og milliÃ¾jÃ³nn"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "SlÃ¶kkva"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ã?nettengt"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "RÃ¦sa Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Get ekki aflÃ¦st dulritaÃ°ri gagnageymslu meÃ° Ã¾essum lykilfrasa."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -284,8 +284,7 @@ msgstr ""
 "live-persist mistÃ³kst meÃ° svarkÃ³Ã°a {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -296,7 +295,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/it/it.po b/it/it.po
index 05cfce1..e65392d 100644
--- a/it/it.po
+++ b/it/it.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Random_R <rand@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
@@ -92,12 +92,24 @@ msgstr "Spoof di tutti gli indirizzi MAC (predefinito)"
 msgid "Don't spoof MAC addresses"
 msgstr "Nessuno spoof degli indirizzi MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Impossibile sbloccare il volume cifrato con questa password."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Configurerai il bridge Tor e il proxy locale piÃ¹ tardi dopo la connessione a"
+" una rete."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Benvenuti in Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -105,76 +117,80 @@ msgstr ""
 "Per farti guidare tra le impostazioni di Tails, clicca <b>Fai un Tour</b> "
 "sopra"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Language & Region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Impostazioni predefinite"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Save Language & Region Settings"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Lingua"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Disposizione tastiera"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formati"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Fuso orario"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Volume persistente cifrato"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Mostra password"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configura volume persistente"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Inserisci la tua password per sbloccare il volume persistente"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Sblocca"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Riblocca volume persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Impostazioni aggiuntive"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Salva impostazioni aggiuntive"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Aggiungi un'impostazione aggiuntiva"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Configurazione di rete"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -184,19 +200,19 @@ msgstr ""
 "configurare un bridge Tor o un proxy locale. Per lavorare completamente "
 "offline, puoi disattivare tutta la rete."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Connetti direttamente alla rete Tor (predefinito)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configura un bridge Tor, firewall o impostazioni proxy"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Disattiva tutta la rete"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -204,79 +220,63 @@ msgstr ""
 "Le impostazioni predefinite vanno bene nella maggior parte dei casi. Per "
 "aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Off (predefinito)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "On (predefinito)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Connessione di rete"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Diretta (predefinito)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Chiusura"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bridge e Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Avvia Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Non in linea"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Impossibile ribloccare il volume persistente."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Sblocco..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Indietro"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Sblocco..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Configurerai il bridge Tor e il proxy locale piÃ¹ tardi dopo la connessione a"
-" una rete."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "On"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Off"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Impossibile ribloccare il volume persistente."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bridge e Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Chiusura"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Non in linea"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Avvia Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Impossibile sbloccare il volume cifrato con questa password."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -285,8 +285,7 @@ msgstr ""
 "live-persist fallito con codice di ritorno {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -297,7 +296,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ja/ja.po b/ja/ja.po
index 048a910..3f7d80a 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Hussein Hassan <hehewawa1@xxxxxxxxx>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
@@ -82,190 +82,189 @@ msgstr "å?¨ã?¦ã?®MACã?¢ã??ã?¬ã?¹ã??è©?ç§°ã??ã??(å??æ??è¨å®?å?¤)"
 msgid "Don't spoof MAC addresses"
 msgstr "MACã?¢ã??ã?¬ã?¹ã??è©?ç§°ã??ã?ªã??"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "Tailsã?¸ã??ã??ã??ã??ï¼?"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "è¨?èª?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ã??ã??ã??ã?¯ã?¼ã?¯è?½å??ã??å?¨ã?¦ç?¡å?¹å??"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "å??æ¢"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "ã?ªã??ã?©ã?¤ã?³"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "ã?ã?£ã?³ã?»ã?«"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "è¿½å? "
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "æ?»ã??"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "å??æ¢"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "ã?ªã??ã?©ã?¤ã?³"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/jv/jv.po b/jv/jv.po
index 3081046..fb16e9b 100644
--- a/jv/jv.po
+++ b/jv/jv.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Javanese (https://www.transifex.com/otf/teams/1519/jv/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ka/ka.po b/ka/ka.po
index 08df036..5652fcd 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "á??á??á??"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "á??á??á?£á?¥á??á??á??á??"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "á??á??á??á??á?¢á??á??á??"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "á??á??á?¡á?£á??á?? á?¥á?¡á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "á??á??á?£á?¥á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "á??á??á??á??á?¢á??á??á??"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "á??á??á?¡á?£á??á?? á?¥á?¡á??á??á??á??á??á??"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/kk/kk.po b/kk/kk.po
index 17e079c..49cd11a 100644
--- a/kk/kk.po
+++ b/kk/kk.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Kazakh (https://www.transifex.com/otf/teams/1519/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/km/km.po b/km/km.po
index 00263e3..92dc41a 100644
--- a/km/km.po
+++ b/km/km.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sokhem Khoem <sokhem@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Khmer (https://www.transifex.com/otf/teams/1519/km/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "á??á?¶á??á?¶"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "á??á?·á??â??á??á?¶á??â??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á??â??á??á?¶á??á??á?¢á??á??"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "á??á?·á??"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "á??á??á??á??á??á??"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "á??á??á??á??á??á??"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "á??á?·á??"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/kn/kn.po b/kn/kn.po
index eac3740..7aa0fec 100644
--- a/kn/kn.po
+++ b/kn/kn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: MSJ <mallikarjunasj@xxxxxxxxx>, 2016\n"
 "Language-Team: Kannada (https://www.transifex.com/otf/teams/1519/kn/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à²à²¾à²·à³?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ko/ko.po b/ko/ko.po
index 6088ea5..9c178b2 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yongmin Hong <revi@xxxxxxxxx>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
@@ -83,190 +83,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "ì?¸ì?´"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr " ë?¤í?¸ì??í?¬ ì?°ê²°ì?? ë¹?í??ì?±í??"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "ì¢?ë£?"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "ì?¤í??ë?¼ì?¸"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "ì·¨ì??"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "ì¶?ê°?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "ë?¤ë¡?"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "ì¢?ë£?"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "ì?¤í??ë?¼ì?¸"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -274,7 +273,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po
index 842c36c..07fd3b5 100644
--- a/ko_KR/ko_KR.po
+++ b/ko_KR/ko_KR.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dr.what <javrick6@xxxxxxxxx>, 2016\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/otf/teams/1519/ko_KR/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "ì?¸ì?´"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "ì¢?ë£?"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "ì·¨ì??"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "ì?¤í??ë?¼ì?¸"
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
-msgstr "ë?¤ë¡?"
-
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "ì·¨ì??"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
+msgstr "ë?¤ë¡?"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "ì¢?ë£?"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "ì?¤í??ë?¼ì?¸"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ku/ku.po b/ku/ku.po
index 447ed8e..1146def 100644
--- a/ku/ku.po
+++ b/ku/ku.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Kurdish (https://www.transifex.com/otf/teams/1519/ku/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po
index 1737601..d552961 100644
--- a/ku_IQ/ku_IQ.po
+++ b/ku_IQ/ku_IQ.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rasti K5 <rasti.khdhr@xxxxxxxxx>, 2016\n"
 "Language-Team: Kurdish (Iraq) (https://www.transifex.com/otf/teams/1519/ku_IQ/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ø²Ù?Ø§Ù?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ø¯Û?Ø±Ù?Û?Úµ"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ù?Û?ÚµÙ?Û?Ø´Ø§Ù?Ø¯Ù?Û?Ù?Û?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ø²Û?Ø§Ø¯Ú©Ø±Ø¯Ù?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ø¯Û?Ø±Ù?Û?Úµ"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/kw/kw.po b/kw/kw.po
index 906b4ff..93e7a34 100644
--- a/kw/kw.po
+++ b/kw/kw.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Cornish (https://www.transifex.com/otf/teams/1519/kw/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ky/ky.po b/ky/ky.po
index 68c9ddb..36d6052 100644
--- a/ky/ky.po
+++ b/ky/ky.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Kyrgyz (https://www.transifex.com/otf/teams/1519/ky/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Ð?Ð¹Ð½Ñ?Ñ?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Ð?Ð¹Ð½Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/la/la.po b/la/la.po
index 1beb713..54f3197 100644
--- a/la/la.po
+++ b/la/la.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alisa P <parashchenko.alisa@xxxxxxxxxx>, 2016\n"
 "Language-Team: Latin (https://www.transifex.com/otf/teams/1519/la/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Lingua"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Omnes coniunctiones defacere"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Claudere"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Claudere"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/lb/lb.po b/lb/lb.po
index b42faa0..92b9d3e 100644
--- a/lb/lb.po
+++ b/lb/lb.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Luxembourgish (https://www.transifex.com/otf/teams/1519/lb/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Sprooch"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "All Netzwierkfunktiounen desaktivÃ©ieren"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Ofbriechen"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "BÃ¤ifÃ¼gen"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Ofbriechen"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "BÃ¤ifÃ¼gen"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/lg/lg.po b/lg/lg.po
index ff139ff..06e2713 100644
--- a/lg/lg.po
+++ b/lg/lg.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Ganda (https://www.transifex.com/otf/teams/1519/lg/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ln/ln.po b/ln/ln.po
index 178c17e..51f2655 100644
--- a/ln/ln.po
+++ b/ln/ln.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Lingala (https://www.transifex.com/otf/teams/1519/ln/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/lo/lo.po b/lo/lo.po
index abcee54..6a6e6f6 100644
--- a/lo/lo.po
+++ b/lo/lo.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Lao (https://www.transifex.com/otf/teams/1519/lo/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "àº?àº»àº?à»?àº¥àºµàº?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "àº?àº»àº?à»?àº¥àºµàº?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/lt/lt.po b/lt/lt.po
index 2ecbdf0..887c649 100644
--- a/lt/lt.po
+++ b/lt/lt.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Gediminas Golcevas <>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
@@ -91,87 +91,103 @@ msgstr "Klastoti visus MAC adresus (numatytasis)"
 msgid "Don't spoof MAC addresses"
 msgstr "Neklastoti MAC adresus"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"JÅ«s sukonfigÅ«ruosite Tor tinklÅ³ tiltÄ? ir vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯ vÄ?liau, "
+"po prisijungimo prie tinklo."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Sveiki atvykÄ? Ä¯ Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Kalba ir regionas"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Numatytieji nustatymai"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Ä®raÅ¡yti kalbos ir regiono nustatymus"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Kalba"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "KlaviatÅ«ros iÅ¡dÄ?stymas"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formatai"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Laiko juosta"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Å ifruotas ilgalaikis kaupiklis"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Rodyti slaptafrazÄ?"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "KonfigÅ«ruoti ilgalaikÄ¯ kaupiklÄ¯"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ä®veskite savo slaptafrazÄ?, kad atrakintumÄ?te ilgalaikÄ¯ kaupiklÄ¯"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Atrakinti"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "IÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Papildomi nustatymai"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Ä®raÅ¡yti papildomus nustatymus"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "PridÄ?ti papildomÄ? nustatymÄ?"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Tinklo konfigÅ«ravimas"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -182,20 +198,20 @@ msgstr ""
 "Ä¯galiotÄ?jÄ¯ serverÄ¯. NorÄ?dami dirbti visiÅ¡kai atsijungus nuo tinklo, galite "
 "iÅ¡jungti visÄ? darbÄ? tinkle."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Prisijungti tiesiogiai prie Tor tinklo (numatytasis)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 "KonfigÅ«ruoti Tor tinklÅ³ tiltÄ?, uÅ¾kardÄ? ar Ä¯galiotojo serverio nustatymus"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "IÅ¡jungti visÄ? darbÄ? tinkle"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -203,79 +219,63 @@ msgstr ""
 "Numatytieji nustatymai daugelyje situacijÅ³ yra saugÅ«s. NorÄ?dami pridÄ?ti "
 "tinkintÄ? nustatymÄ?, Å¾emiau spustelÄ?kite mygtukÄ? \"+\"."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "IÅ¡jungta (numatytasis)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Ä®jungta (numatytasis)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Tinklo ryÅ¡ys"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Tiesioginis (numatytasis)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "IÅ¡jungti"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Paleisti Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Nepavyko iÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Atrakinama..."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "PridÄ?ti"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Atgal"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Atrakinama..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"JÅ«s sukonfigÅ«ruosite Tor tinklÅ³ tiltÄ? ir vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯ vÄ?liau, "
-"po prisijungimo prie tinklo."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Ä®jungta"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "IÅ¡jungta"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Nepavyko iÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯."
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "IÅ¡jungti"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Paleisti Tails"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
-
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -284,8 +284,7 @@ msgstr ""
 "live-persist nepavyko su grÄ¯Å¾ties kodu {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -296,7 +295,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/lv/lv.po b/lv/lv.po
index dae07dc..9b954e9 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/otf/teams/1519/lv/)\n"
@@ -91,12 +91,24 @@ msgstr "MaldinoÅ¡i norÄ?dÄ«t visas MAC adreses (noklusÄ?juma vÄ?rtÄ«ba)"
 msgid "Don't spoof MAC addresses"
 msgstr "MaldinoÅ¡i nenorÄ?dÄ«t MAC adreses"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"VÄ?lÄ?k, pÄ?c tam, kad izveidosit savienojumu ar tÄ«klu, JÅ«s konfigurÄ?sit Tor "
+"tiltu vai vietÄ?jo starpniekserveri."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "SveicinÄ?ti Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,76 +116,80 @@ msgstr ""
 "Lai uzzinÄ?tu vairÄ?k par Tails iestatÄ«jumiem, noklikÅ¡Ä·iniet uz "
 "<b>IepazÄ«stieties</b> augstÄ?k."
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Valoda un reÄ£ions"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "NoklusÄ?juma iestatÄ«jumi"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "SaglabÄ?t valodas un reÄ£iona iestatÄ«jumus"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Valoda"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "TastatÅ«ras izkÄ?rtojums"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "FormÄ?ti"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Laika zonas"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Å ifrÄ?ta pastÄ?vÄ«gÄ? krÄ?tuve"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "ParÄ?dÄ«t paroles frÄ?zi"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "KonfigurÄ?t pastÄ?vÄ«go krÄ?tuvi"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ievadiet savu paroles frÄ?zi, lai atslÄ?gtu pastÄ?vÄ«go krÄ?tuvi"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "AtslÄ?gt"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "AtkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Papildu iestatÄ«jumi"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "SaglabÄ?t papildu iestatÄ«jumus"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Pievienot papildu iestatÄ«jumu"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "TÄ«kla konfigurÄ?Å¡ana"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -183,19 +199,19 @@ msgstr ""
 "varat nokonfigurÄ?t Tor tiltu vai vietÄ?jo starpniekserveri. Lai pilnÄ«gi "
 "strÄ?dÄ?tu bezsaistÄ?, JÅ«s varat atspÄ?jot jebkÄ?du tÄ«kloÅ¡anu."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Veidot tieÅ¡u savienojumu ar tÄ«klu Tor (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "KonfigurÄ?t Tor tilta, ugunsmÅ«ra vai starpniekservera iestatÄ«jumus"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "AtspÄ?jot jebkÄ?du tÄ«kloÅ¡anu"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -203,79 +219,63 @@ msgstr ""
 "VairumÄ? gadÄ«jumu noklusÄ?juma vÄ?rtÄ«bas ir droÅ¡as. Lai pievienotu pielÄ?gotus "
 "iestatÄ«jumus, nospiediet tÄ?lÄ?k esoÅ¡o \"+\" pogu."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "IzslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "TÄ«kla savienojumi"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "TieÅ¡s (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "IzslÄ?gÅ¡ana"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Tilti un starpniekserveri"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "SÄ?kt Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "BezsaistÄ?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "NeizdevÄ?s atkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "AtslÄ?dz..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Pievienot"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "AtpakaÄ¼"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "AtslÄ?dz..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"VÄ?lÄ?k, pÄ?c tam, kad izveidosit savienojumu ar tÄ«klu, JÅ«s konfigurÄ?sit Tor "
-"tiltu vai vietÄ?jo starpniekserveri."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "IeslÄ?gt"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "IzslÄ?gt"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "NeizdevÄ?s atkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Tilti un starpniekserveri"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "IzslÄ?gÅ¡ana"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "BezsaistÄ?"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "SÄ?kt Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -284,8 +284,7 @@ msgstr ""
 "live-persist neizdevÄ?s, norÄ?dÄ«tais kods {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -296,7 +295,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/mg/mg.po b/mg/mg.po
index de3ed12..6cd747e 100644
--- a/mg/mg.po
+++ b/mg/mg.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Malagasy (https://www.transifex.com/otf/teams/1519/mg/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/mi/mi.po b/mi/mi.po
index 95f9220..eb4ad16 100644
--- a/mi/mi.po
+++ b/mi/mi.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Maori (https://www.transifex.com/otf/teams/1519/mi/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/mk/mk.po b/mk/mk.po
index e5673e8..1e93681 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: orvel_mk <george.orwell50@xxxxxxxxx>, 2016\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
-msgstr "Ð?Ð°Ð·Ð°Ð´"
-
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
+msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ml/ml.po b/ml/ml.po
index 2674779..4656196 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/mn/mn.po b/mn/mn.po
index 6628afe..c80c3fa 100644
--- a/mn/mn.po
+++ b/mn/mn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Mongolian (https://www.transifex.com/otf/teams/1519/mn/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/mr/mr.po b/mr/mr.po
index 55dab34..ead3b3c 100644
--- a/mr/mr.po
+++ b/mr/mr.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vikrant Korde <vikrant.korde@xxxxxxxxx>, 2016\n"
 "Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¤¾"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "à¤?à¥?à¤¡à¤¾"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¤¾"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "à¤?à¥?à¤¡à¤¾"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po
index b733bcd..7d3c7f3 100644
--- a/ms_MY/ms_MY.po
+++ b/ms_MY/ms_MY.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mohd Shahril Bin Zainol Abidin <mohd_shahril_96@xxxxxxxxx>, 2016\n"
 "Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Bahasa"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Tambah"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Kembali"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/mt/mt.po b/mt/mt.po
index 8d59edb..96d41de 100644
--- a/mt/mt.po
+++ b/mt/mt.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Maltese (https://www.transifex.com/otf/teams/1519/mt/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/my/my.po b/my/my.po
index d94cf5b..e44c93d 100644
--- a/my/my.po
+++ b/my/my.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "á??á?¬á??á?¬á??á??á?¬á?¸"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "á??á??á?ºá??á?á??á?ºá??á??á?º"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "á??á?»á??á?ºá??á?á??á?ºá?¸á??á??á?º"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "á?¡á?±á?¬á?·á??á?ºá??á?á?¯á??á?ºá?¸"
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
-msgstr "á??á?±á?¬á??á?ºá??á?á?¯á?·"
-
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "á??á?»á??á?ºá??á?á??á?ºá?¸á??á??á?º"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
+msgstr "á??á?±á?¬á??á?ºá??á?á?¯á?·"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "á??á??á?ºá??á?á??á?ºá??á??á?º"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "á?¡á?±á?¬á?·á??á?ºá??á?á?¯á??á?ºá?¸"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nah/nah.po b/nah/nah.po
index 70d7480..b93d7e5 100644
--- a/nah/nah.po
+++ b/nah/nah.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Nahuatl (https://www.transifex.com/otf/teams/1519/nah/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nap/nap.po b/nap/nap.po
index 64ee790..7b9f406 100644
--- a/nap/nap.po
+++ b/nap/nap.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Neapolitan (https://www.transifex.com/otf/teams/1519/nap/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nb/nb.po b/nb/nb.po
index 244301d..23db08b 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Knut Ole <>, 2016\n"
 "Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/otf/teams/1519/nb/)\n"
@@ -91,12 +91,24 @@ msgstr "Simuler alle MAC-adresser (forvalg)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ikke simuler MAC-adresser"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan ikke lÃ¥se opp kryptert lagring med denne passordsekvensen."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Du vil sette opp Tor-broen og lokal mellomtjener senere etter Ã¥ ha koblet "
+"til et nettverk."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Velkommen til Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,76 +116,80 @@ msgstr ""
 "For Ã¥ bli veiledet gjennom Tails innstillinger, klikk <b>Ã?pne veiledning</b>"
 " ovenfor"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "SprÃ¥k og region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Forvalgte innstillinger"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Lagre sprÃ¥k- og regions -innstillinger"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Tastauroppsett"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formater"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Kryptert vedvarende lagring"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Vis passordsekvens"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Sett opp vedvarende lagring"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Skriv inn din passordsekvens for Ã¥ lÃ¥se opp det vedvarende lageret"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "LÃ¥s opp"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "LÃ¥s vedvarende lagring igjen"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Ytterligere innstillinger"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Lagre ytterligere innstillinger"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Legg till ytterligere innstilling"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Nettverksoppsett"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -184,19 +200,19 @@ msgstr ""
 "mellomtjener. For Ã¥ jobbe helt frakoblet, kan du skru av all "
 "nettverkstilknytning."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Koble direkte til Tor-nettverket (forvalg)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Sett opp en Tor-bro, brannmur, eller mellomtjeningsinnstillinger"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Skru av alle nettverk"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -204,79 +220,63 @@ msgstr ""
 "De forvalgte innstillingene er trygg i de fleste fall. For Ã¥ legge til en "
 "egendefinert innstilling, trykk \"+\"-knappen nedenfor."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Av (forvalg)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "PÃ¥ (forvalg)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Nettverkstilkobling"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direkte (forvalg)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "SlÃ¥ av"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bro og mellomtjener"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Klarte ikke Ã¥ lÃ¥se vedvarende lagring igjen."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "LÃ¥ser oppâ?¦"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Legg til"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "LÃ¥ser oppâ?¦"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Du vil sette opp Tor-broen og lokal mellomtjener senere etter Ã¥ ha koblet "
-"til et nettverk."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Av"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "PÃ¥"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Klarte ikke Ã¥ lÃ¥se vedvarende lagring igjen."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bro og mellomtjener"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "SlÃ¥ av"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Frakoblet"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Start Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan ikke lÃ¥se opp kryptert lagring med denne passordsekvensen."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -285,8 +285,7 @@ msgstr ""
 "live-persist feilet med returkode {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -297,7 +296,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nds/nds.po b/nds/nds.po
index 970ffb8..d11b40a 100644
--- a/nds/nds.po
+++ b/nds/nds.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Low German (https://www.transifex.com/otf/teams/1519/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ne/ne.po b/ne/ne.po
index f2a0031..4b258ee 100644
--- a/ne/ne.po
+++ b/ne/ne.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Nepali (https://www.transifex.com/otf/teams/1519/ne/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nl/nl.po b/nl/nl.po
index db53bfb..62f5294 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Wim <wikkesjr@xxxxxxxxx>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
@@ -88,12 +88,24 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Je zal de Tor Bridge en lokale proxy later instellen nadat je met een "
+"netwerk verbinding hebt gemaakt."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Welkom bij Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -101,95 +113,99 @@ msgstr ""
 "Om de rondleiding door de Tails' settings te volgen, klik op <b> Start de "
 "Rondleiding</b> hierboven"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Taal & Regio"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Standaard instellingen"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Bewaar Taal & Regio instellingen"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Toetsenbordindeling"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formaten"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Tijdzone"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "maak los"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "bijkomende instellingen"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "bewaar bijkomende instellingen"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "voeg een bijkomende instelling toe"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Netwerkconfiguratie"
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Verbind rechtstreeks met het Tor netwerk (standaard)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configureer en Tor bridge, firewall of proxy instelling"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Alle netwerken uitschakelen"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -197,87 +213,70 @@ msgstr ""
 "De standaard instellingen zijn veilig in de meeste situaties. Om een "
 "aangepaste instelling toe te voegen, klik op de \"+\"knop hieronder."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Uit (standaard)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Aan (standaard)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Netwerkverbinding"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Rechtstreeks (standaard)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Uitschakelen"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "maak los"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Voeg toe"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Vorige"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "maak los"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Je zal de Tor Bridge en lokale proxy later instellen nadat je met een "
-"netwerk verbinding hebt gemaakt."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Aan"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Uitschakelen"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Start Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -285,7 +284,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
index 595002c..9f12c26 100644
--- a/nl_BE/nl_BE.po
+++ b/nl_BE/nl_BE.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Katrien Igodt <kigodt@xxxxxxxxx>, 2016\n"
 "Language-Team: Dutch (Belgium) (https://www.transifex.com/otf/teams/1519/nl_BE/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nn/nn.po b/nn/nn.po
index 9cf740e..447baf6 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Norwegian Nynorsk (https://www.transifex.com/otf/teams/1519/nn/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "Velkomen til Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "SprÃ¥k og region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Standard-innstillingar"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Tastaturoppsett"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Format"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Vis passord"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Fjern blokkering"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Tillegsinnstillingar"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Nettverksoppsett"
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "SlÃ¥ av alle nettverksfunksjonar"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Av (standard)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "PÃ¥ (standard)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Nettverkssamband"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direkte (standard)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "FrÃ¥kopla"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Fjernar blokkering"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Avbrjot"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Legg til"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Fjernar blokkering"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "PÃ¥"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Av"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "FrÃ¥kopla"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Start Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/nso/nso.po b/nso/nso.po
index 3e7e955..eb81221 100644
--- a/nso/nso.po
+++ b/nso/nso.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Northern Sotho (https://www.transifex.com/otf/teams/1519/nso/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/oc/oc.po b/oc/oc.po
index 95fec7b..b3a1ec9 100644
--- a/oc/oc.po
+++ b/oc/oc.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Occitan (post 1500) (https://www.transifex.com/otf/teams/1519/oc/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/om/om.po b/om/om.po
index af74406..7f39728 100644
--- a/om/om.po
+++ b/om/om.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Oromo (https://www.transifex.com/otf/teams/1519/om/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/or/or.po b/or/or.po
index 437fcdb..3f27973 100644
--- a/or/or.po
+++ b/or/or.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Oriya (https://www.transifex.com/otf/teams/1519/or/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/pa/pa.po b/pa/pa.po
index e79c6db..5b0fb56 100644
--- a/pa/pa.po
+++ b/pa/pa.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: A S Alam <apreet.alam@xxxxxxxxx>, 2016\n"
 "Language-Team: Panjabi (Punjabi) (https://www.transifex.com/otf/teams/1519/pa/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "à¨¬à©°à¨¦ à¨?à¨°à©?"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "à¨°à©±à¨¦ à¨?à¨°à©?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "à¨¶à¨¾à¨®à¨¿à¨²"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "à¨°à©±à¨¦ à¨?à¨°à©?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "à¨¶à¨¾à¨®à¨¿à¨²"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "à¨¬à©°à¨¦ à¨?à¨°à©?"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/pap/pap.po b/pap/pap.po
index 95ba43b..868f0e6 100644
--- a/pap/pap.po
+++ b/pap/pap.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Papiamento (https://www.transifex.com/otf/teams/1519/pap/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/pl/pl.po b/pl/pl.po
index 1fe3ec8..e847f54 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Marcin S <dzidek1003@xxxxx>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
@@ -92,87 +92,103 @@ msgstr "FaÅ?szuj wszystkie adresy MAC (domyÅ?lne)"
 msgid "Don't spoof MAC addresses"
 msgstr "Nie faÅ?szuj adresu MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Nie moÅ¼na odblokowaÄ? zaszyfrowanej pamiÄ?ci z tym hasÅ?em."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"MoÅ¼esz skonfigurowaÄ? ustawienia mostka i lokalne proxy po wczeÅ?niejszym "
+"poÅ?Ä?czeniu z sieciÄ?."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Witaj w Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "JÄ?zyk i Lokalizacja"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Ustawienia DomyÅ?lne"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Zapisz ustawienia JÄ?zyka i Lokalizacji"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "JÄ?zyk"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "UkÅ?ad Kalwiatury"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formaty"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Strefa Czasowa"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Zaszyfruj PamiÄ?Ä? TrwaÅ?Ä?"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "PokaÅ¼ HasÅ?o"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Skonfiguruj PamiÄ?Ä? TrwaÅ?Ä?"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Wpisz Twoje hasÅ?o do odblokowania przechowania danych"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Odblokuj"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Ponownie zablokuj PamiÄ?Ä? TrwaÅ?Ä?"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Dodatkowe Ustawienia"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Zapisz Dodatkowe Ustawienia"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Dodaj dodatkowe ustawienie"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Konfiguracja Sieci"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -182,19 +198,19 @@ msgstr ""
 "lub przepuszczane przez proxy.MoÅ¼esz skonfigurowaÄ? most lub ustawienia "
 "proxy. Do caÅ?kowitej pracy offline, moÅ¼esz wyÅ?Ä?czyÄ? wszystkie sieci."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "PoÅ?Ä?cz bezpoÅ?rednio do Sieci Tor (domyÅ?lne)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Skonfiguruj Mostki Tor, firewall lub ustawienia proxy"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "WyÅ?Ä?cz wszystkie poÅ?Ä?czenia sieciowe"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -202,79 +218,63 @@ msgstr ""
 "Ustawienia domyÅ?lne sÄ? bezpieczne w wiÄ?kszoÅ?ci sytuacji. Aby dodaÄ? wÅ?asne "
 "ustawienie , kliknij \"+\" poniÅ¼ej."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "WyÅ?Ä?czony (domyÅ?lny)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "WÅ?Ä?czony (domyÅ?lny)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "PoÅ?Ä?czenie sieciowe"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "PoÅ?Ä?cz (domyÅ?lny)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "WyÅ?Ä?czenie"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Mostek i Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Poza zasiÄ?giem"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Nie udaÅ?o siÄ? ponownie zablokowaÄ? PamiÄ?ci TrwaÅ?ej."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Odblokowanie ..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "wstecz"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Odblokowanie ..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"MoÅ¼esz skonfigurowaÄ? ustawienia mostka i lokalne proxy po wczeÅ?niejszym "
-"poÅ?Ä?czeniu z sieciÄ?."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "On"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Off"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Nie udaÅ?o siÄ? ponownie zablokowaÄ? PamiÄ?ci TrwaÅ?ej."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Mostek i Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "WyÅ?Ä?czenie"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Poza zasiÄ?giem"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Start Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Nie moÅ¼na odblokowaÄ? zaszyfrowanej pamiÄ?ci z tym hasÅ?em."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -283,8 +283,7 @@ msgstr ""
 "live-persist zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -295,7 +294,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/pms/pms.po b/pms/pms.po
index 95c0d34..ad010e7 100644
--- a/pms/pms.po
+++ b/pms/pms.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Piemontese (https://www.transifex.com/otf/teams/1519/pms/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ps/ps.po b/ps/ps.po
index 595b836..3fc184d 100644
--- a/ps/ps.po
+++ b/ps/ps.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Pushto (https://www.transifex.com/otf/teams/1519/ps/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/pt/pt.po b/pt/pt.po
index 1345d34..9087fcf 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cesar Silva <cesarsilvabx@xxxxxxxxx>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/otf/teams/1519/pt/)\n"
@@ -86,194 +86,193 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"NÃ£o Ã© possÃvel desbloquear o armazenamento encriptado com esta frase de "
+"palavra-passe."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "Bem-vindo ao Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Idioma e RegiÃ£o"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ConfiguraÃ§Ãµes Predefinidas"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Guardar ConfiguraÃ§Ãµes do Idioma e RegiÃ£o"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "DisposiÃ§Ã£o do Teclado"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formatos"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Zona HorÃ¡ria"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Armazenamento Persistente encriptado"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Mostrar Frase de Palavra-passe "
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configurar Armazenamento Persistente"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Insira a sua frase de palavra-passe para desbloquear o armazenamento "
 "persistente"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Voltar a bloquear o Armazenamento Persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "ConfiguraÃ§Ãµes Adicionais"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Guardar ConfiguraÃ§Ãµes Adicionais"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Adicionar uma configuraÃ§Ã£o adicional"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "ConfiguraÃ§Ã£o de Rede"
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Ligar diretamente Ã  rede Tor (predefiniÃ§Ã£o)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desativar toda a rede"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Desativado (predefiniÃ§Ã£o)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Ativado (predefiniÃ§Ã£o)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "LigaÃ§Ã£o de Rede"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direto (predefiniÃ§Ã£o)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Encerrar"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Ponte e Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Off-line"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "A desbloquear..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Anterior"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "A desbloquear..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Ativar"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Desativar"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Encerrar"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Ponte e Proxy"
-
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Off-line"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"NÃ£o Ã© possÃvel desbloquear o armazenamento encriptado com esta frase de "
-"palavra-passe."
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -281,7 +280,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index ebf69d8..1c52ef7 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01@xxxxxxxxxxxx>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
@@ -91,12 +91,26 @@ msgstr "Marcarar a identidade de todos os endereÃ§os MAC (padrÃ£o)"
 msgid "Don't spoof MAC addresses"
 msgstr "NÃ£o mascarar a identidade de endereÃ§os MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+"NÃ£o foi possÃvel abrir o dispositivo de armazenamento criptografado com esta"
+" frase-senha"
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"VocÃª irÃ¡ configurar uma ponte Tor e um proxy local apÃ³s conectar-se a uma "
+"rede."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Boas-vindas ao Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -104,78 +118,82 @@ msgstr ""
 "Se vocÃª desejar um guia das configuraÃ§Ãµes do Tails, clique em <b>Guia</b>, "
 "acima"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Idioma & RegiÃ£o"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "ConfiguraÃ§Ãµes PadrÃ£o"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Salvar ConfiguraÃ§Ãµes de Idioma & RegiÃ£o"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Modelo de Teclado"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formatos"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Zona HorÃ¡ria"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Armazenamento Criptografado Persistent"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Mostrar Frase-senha"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configurar o Dispositivo de Armazenamento Persistente"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Inserir a sua frase-senha para abrir o dispositivo de armazenamento "
 "Persistente"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Abrir"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Fechar o Dispositivo de Armazenamento Persistente de novo"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "ConfiguraÃ§Ãµes Adicionais"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Salvar ConfiguraÃ§Ãµes Adicionais"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr " Incluir uma configuraÃ§Ã£o adicional"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "ConfiguraÃ§Ã£o de rede"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -185,19 +203,19 @@ msgstr ""
 "proxy, vocÃª pode configurar uma ponte Tor ou um proxy local. Para trabalhar "
 "totalmente offline, Ã© preciso desabilitar toda conexÃ£o de rede."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Conectar-se diretamente Ã  rede Tor (padrÃ£o)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configurar uma ponte Tor, Firewall, ou configuraÃ§Ãµes de proxy"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Desativar toda conexÃ£o de rede"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -205,81 +223,63 @@ msgstr ""
 "A configuraÃ§Ãµes padrÃ£o sÃ£o seguras na maioria dos casos. Para adicional "
 "configuraÃ§Ãµes personalizadas, clique na tecla \"+\" abaixo."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Desativar (padrÃ£o)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Ativar (padrÃ£o)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "ConexÃ£o de Rede"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direta (padrÃ£o)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Desligar"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Ponte & Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Iniciar Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "sem linha"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Falha ao fechar de novo o dispositivo de armazenamento Persistent ."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Abrindo..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Voltar"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Abrindo..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"VocÃª irÃ¡ configurar uma ponte Tor e um proxy local apÃ³s conectar-se a uma "
-"rede."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Ativar"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Desativar"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Falha ao fechar de novo o dispositivo de armazenamento Persistent ."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Ponte & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Desligar"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "sem linha"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Iniciar Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
-"NÃ£o foi possÃvel abrir o dispositivo de armazenamento criptografado com esta"
-" frase-senha"
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -288,8 +288,7 @@ msgstr ""
 "live-persist nÃ£o pÃ´de retornar o cÃ³digo {returncode]:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -300,7 +299,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ro/ro.po b/ro/ro.po
index fd57891..8a528ad 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: drazvan <razvan.net@xxxxxxxxx>, 2017\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -84,87 +84,101 @@ msgstr "FalsificÄ? toate adresele MAC (implicit)"
 msgid "Don't spoof MAC addresses"
 msgstr "Nu falsifica adresele MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "Bun venit la Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "LimbÄ? È?i Regiune"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "SetÄ?ri implicite"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "SalveazÄ? setÄ?rile de LimbÄ? È?i Regiune"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "LimbÄ?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formate"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Fus orar"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Stocare persistentÄ? criptatÄ?"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "AratÄ? parola"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "ConfigureazÄ? stocarea persistentÄ?"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Introdu parola ta pentru a debloca stocarea persistentÄ?."
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "DeblocheazÄ?"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "BlocheazÄ? din nou Stocarea persistentÄ?"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "SetÄ?ri adiÈ?ionale"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "SalveazÄ? SetÄ?rile adiÈ?ionale"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "AdaugÄ? o setare adiÈ?ionalÄ?"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Configurare reÈ?ea"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -174,19 +188,19 @@ msgstr ""
 "un proxy, poÈ?i configura o punte Tor sau un proxy local. Pentru a lucra "
 "complet Ã®n mod deconectat, poÈ?i dezactiva reÈ?eaua."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "ConecteazÄ?-te direct la reÈ?eaua Tor (implicit)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "ConfigureazÄ? o punte Tor, un firewall, sau setÄ?rile proxy"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DezactivaÈ?i toate reÈ?elele"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -194,85 +208,70 @@ msgstr ""
 "SetÄ?rile implicite sunt sigure Ã®n majoritatea cazurilor. Pentru a adÄ?uga o "
 "setare personalizatÄ?, apasÄ? pe butonul \"+\" de mai jos."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Dezactivat (implicit)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Activat (implicit)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Conexiune reÈ?ea"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direct (implicit)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Inchide"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bridge È?i Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "PorneÅ?te Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Deconectat"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Se deblocheazÄ?..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "RenunÈ?Ä?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "AdaugÄ?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Ã?napoi"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Se deblocheazÄ?..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Activat"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Dezactivat"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bridge È?i Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Inchide"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Deconectat"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "PorneÅ?te Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -280,7 +279,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ru/ru.po b/ru/ru.po
index e671498..7699be8 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Oleg Sergeev <djvnsk@xxxxx>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
@@ -92,88 +92,103 @@ msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° Ð²Ñ?ÐµÑ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ð?Ðµ Ð¿Ð¾Ð´Ð¼ÐµÐ½Ñ?Ñ?Ñ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°ÐµÑ?Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?Ð¾Ð¹ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¾Ð¹ Ñ?Ñ?Ð°Ð·Ð¾Ð¹."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Ð?Ñ? Ñ?Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ? Tor Ð¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¿Ð¾Ñ?Ð»Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ? Ð² Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "Ð§Ñ?Ð¾Ð±Ñ? Ð¿Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¸Ñ?Ñ?Ñ?Ñ? Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ°Ð¼Ð¸ Tails, Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ Ð½Ð° <b>Take a Tour</b> Ð²Ñ?Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Ð¯Ð·Ñ?Ðº Ð¸ Ñ?ÐµÐ³Ð¸Ð¾Ð½"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð·Ñ?Ðº Ð¸ Ñ?ÐµÐ³Ð¸Ð¾Ð½Ð°Ð»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ð¯Ð·Ñ?Ðº"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Ð Ð°Ñ?ÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Ð§Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð°Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ²Ñ?Ñ? Ñ?Ñ?Ð°Ð·Ñ?:"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð²Ð°Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ²Ñ?Ñ? Ñ?Ñ?Ð°Ð·Ñ? Ð´Ð»Ñ? Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ð°"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Ð?Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ð¹ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ñ?ÐµÑ?Ð¸"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -184,19 +199,19 @@ msgstr ""
 "Ñ?Ð¾Ð³Ð¾, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ð½Ð¾Ñ?Ñ?Ñ?Ñ? Ð² Ð°Ð²Ñ?Ð¾Ð½Ð¾Ð¼Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ, Ð²Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²Ñ?Ðµ "
 "Ñ?ÐµÑ?Ð¸."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Ðº Ñ?ÐµÑ?Ð¸ Tor (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ð¼Ð¾Ñ?Ñ?Ð° Tor, Ð±Ñ?Ð°Ð½Ð´Ð¼Ð°Ñ?Ñ?Ñ?Ð° Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð²Ñ?Ðµ Ñ?ÐµÑ?ÐµÐ²Ñ?Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ?"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -204,78 +219,63 @@ msgstr ""
 "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ð¼Ð¸ Ð² Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ðµ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¹. Ð?Ð»Ñ? "
 "Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¾Ð¹ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸, Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ ÐºÐ½Ð¾Ð¿ÐºÑ? \"+\" Ð½Ð¸Ð¶Ðµ."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Ð¡ÐµÑ?ÐµÐ²Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ð¹ (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Ð?Ð¾Ñ?Ñ? Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Ð?Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ."
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ°..."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð°"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ°..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Ð?Ñ? Ñ?Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ? Tor Ð¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¿Ð¾Ñ?Ð»Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Ð?Ð¾Ñ?Ñ? Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Ð?Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Ð?Ðµ Ñ?Ð´Ð°ÐµÑ?Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?Ð¾Ð¹ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¾Ð¹ Ñ?Ñ?Ð°Ð·Ð¾Ð¹."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -284,8 +284,7 @@ msgstr ""
 "live-persist Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð», ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -296,7 +295,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ru@petr1708/ru@xxxxxxxxxxx b/ru@petr1708/ru@xxxxxxxxxxx
index f2e86c2..261f9a4 100644
--- a/ru@petr1708/ru@xxxxxxxxxxx
+++ b/ru@petr1708/ru@xxxxxxxxxxx
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: alvina alexandrova <alvina_alexandrova@xxxxxxx>, 2016\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/otf/teams/1519/ru@petr1708/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?Ðµ"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?Ðµ"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/scn/scn.po b/scn/scn.po
index 284494a..edc9077 100644
--- a/scn/scn.po
+++ b/scn/scn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Sicilian (https://www.transifex.com/otf/teams/1519/scn/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sco/sco.po b/sco/sco.po
index 8dca275..577f006 100644
--- a/sco/sco.po
+++ b/sco/sco.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: John Reid <john.reid036@xxxxxxxxx>, 2016\n"
 "Language-Team: Scots (https://www.transifex.com/otf/teams/1519/sco/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Turn-aff"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Turn-aff"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po
index 721d978..762387f 100644
--- a/si_LK/si_LK.po
+++ b/si_LK/si_LK.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Randika Dilshan Pathirage <randika.pathirage@xxxxxxxxx>, 2016\n"
 "Language-Team: Sinhala (Sri Lanka) (https://www.transifex.com/otf/teams/1519/si_LK/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à¶·à·?à·?à·?à·?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "à·?à·?à¶±à·?à¶±"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "à¶±à·?à¶¶à·?à¶¯à·?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "à¶?à·?à¶½à¶?à¶?à·? à¶?à¶»à¶±à·?à¶±"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "à¶?à¶?à¶à·? à¶?à¶»à¶±à·?à¶±"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "à¶´à·?à·?à¶´à·?à¶§"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "à·?à·?à¶±à·?à¶±"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "à¶±à·?à¶¶à·?à¶¯à·?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sk/sk.po b/sk/sk.po
index 2a48d54..b4ed431 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Stanislav TomÃ¡Å¡ <stanislav.tomas@xxxxxxxxxx>, 2016\n"
 "Language-Team: Slovak (https://www.transifex.com/otf/teams/1519/sk/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "NepripojenÃ½"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "ZruÅ¡iÅ¥"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "PridaÅ¥"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "SpÃ¤Å¥"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "NepripojenÃ½"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index d162a75..57f313d 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: DaÅ¡a MatÃºÅ¡ovÃ¡ <dasa.matusova@xxxxxxxxx>, 2016\n"
 "Language-Team: Slovak (Slovakia) (https://www.transifex.com/otf/teams/1519/sk_SK/)\n"
@@ -84,190 +84,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "DeaktivovaÅ¥ vÅ¡etky siete"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Vypnutie"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "ZruÅ¡iÅ¥"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "PridaÅ¥"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "ZruÅ¡iÅ¥"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "PridaÅ¥"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Vypnutie"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -275,7 +274,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sl/sl.po b/sl/sl.po
index b7a167e..aa10cc5 100644
--- a/sl/sl.po
+++ b/sl/sl.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Matija <matija@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Slovenian (https://www.transifex.com/otf/teams/1519/sl/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ugasni"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "PrekliÄ?i"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Nazaj"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ugasni"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sl_SI/sl_SI.po b/sl_SI/sl_SI.po
index 75ddfaf..3b68943 100644
--- a/sl_SI/sl_SI.po
+++ b/sl_SI/sl_SI.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Matija <matija@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/otf/teams/1519/sl_SI/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Izklop"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "PrekliÄ?i"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "PrekliÄ?i"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Izklop"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sn/sn.po b/sn/sn.po
index 314de2f..70148c4 100644
--- a/sn/sn.po
+++ b/sn/sn.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Shona (https://www.transifex.com/otf/teams/1519/sn/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/so/so.po b/so/so.po
index 1653cf5..2b1a3dc 100644
--- a/so/so.po
+++ b/so/so.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Somali (https://www.transifex.com/otf/teams/1519/so/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/son/son.po b/son/son.po
index 05b8f7c..b78f674 100644
--- a/son/son.po
+++ b/son/son.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Songhay (https://www.transifex.com/otf/teams/1519/son/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sq/sq.po b/sq/sq.po
index 8c21e4c..ec80af2 100644
--- a/sq/sq.po
+++ b/sq/sq.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Albanian (https://www.transifex.com/otf/teams/1519/sq/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Gjuha"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ã?'aktivizoni tÃ« gjitha rrjetet"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Mbylleni"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "I shkÃ«putur"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Hiqeni"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Shtoni"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Mbrapa"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Mbylleni"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "I shkÃ«putur"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sr/sr.po b/sr/sr.po
index baa5092..55f46d4 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ð?Ð°Ñ?ÐµÑ?Ðµ"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ð?Ñ?Ð»Ð°Ñ?Ð½"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ð?Ð°Ñ?ÐµÑ?Ðµ"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ð?Ñ?Ð»Ð°Ñ?Ð½"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sr@latin/sr@xxxxxxxx b/sr@latin/sr@xxxxxxxx
index 81fbfb2..d82873e 100644
--- a/sr@latin/sr@xxxxxxxx
+++ b/sr@latin/sr@xxxxxxxx
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Milenko Doder <svrsavamutebe@xxxxxxxxx>, 2016\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/otf/teams/1519/sr@latin/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "OtkaÅ¾i"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/st/st.po b/st/st.po
index 008280d..5f1b61c 100644
--- a/st/st.po
+++ b/st/st.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Sotho, Southern (https://www.transifex.com/otf/teams/1519/st/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/su/su.po b/su/su.po
index ad7f7b1..cb7f279 100644
--- a/su/su.po
+++ b/su/su.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Sundanese (https://www.transifex.com/otf/teams/1519/su/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sv/sv.po b/sv/sv.po
index 563821f..317a879 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Bo Serrander <bserrander@xxxxxxxxx>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -89,88 +89,104 @@ msgstr "Fejka alla MAC-adresser (standard)"
 msgid "Don't spoof MAC addresses"
 msgstr "Fejka alla MAC-adresser"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Kan inte att lÃ¥sa upp krypterad lagring med detta lÃ¶senord."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Du konfigurerar Tor bron och lokala proxyn senare efter anslutning till ett "
+"nÃ¤tverk."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "VÃ¤lkommen till Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "FÃ¶r att guidas genom Tails instÃ¤llningar, klicka pÃ¥ <b>Ta en tur</b> ovan"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "SprÃ¥k & region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "StandardinstÃ¤llningar"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Spara SprÃ¥k och region instÃ¤llningar"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Tangentbordslayout"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Format"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Tidszon"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Krypterad bestÃ¥ende lagring"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Visa lÃ¶senordsfras"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Konfigurera bestÃ¥ende lagring"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Mata in din lÃ¶senordfras fÃ¶r att lÃ¥sa upp den bestÃ¥ende lagringren"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "LÃ¥sa upp"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "LÃ¥s igen bestÃ¤ndig lagring"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Ytterligare instÃ¤llningar"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Spara ytterligare instÃ¤llningar"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "LÃ¤gg till ytterligare instÃ¤llningar"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "NÃ¤tverkskonfiguration"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -180,19 +196,19 @@ msgstr ""
 "konfigurera en Tor bro eller en lokal proxy. FÃ¶r att arbeta helt urkopplad "
 "kan du inaktivera alla nÃ¤tverk."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Anslut direkt till Tor-nÃ¤tverket (fÃ¶rvald)."
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Konfigurera en Tor brygga, brandvÃ¤gg- eller proxyinstÃ¤llningar"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Inaktivera alla nÃ¤tverk"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -200,79 +216,63 @@ msgstr ""
 "StandardinstÃ¤llningarna Ã¤r sÃ¤kra i de flesta situationer. FÃ¶r att lÃ¤gga till"
 " en anpassad instÃ¤llning, trycka pÃ¥ \"+\"-knappen nedan."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Av (standard)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "PÃ¥ (standard)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "NÃ¤tverksanslutning"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direkt (standard)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "StÃ¤ng av"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bro & Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Starta Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Misslyckades att lÃ¥sa igen bestÃ¤ndig lagring."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "LÃ¥ser upp..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "LÃ¤gg till"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Tillbaka"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "LÃ¥ser upp..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Du konfigurerar Tor bron och lokala proxyn senare efter anslutning till ett "
-"nÃ¤tverk."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "PÃ¥"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Av"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Misslyckades att lÃ¥sa igen bestÃ¤ndig lagring."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bro & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "StÃ¤ng av"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Starta Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Kan inte att lÃ¥sa upp krypterad lagring med detta lÃ¶senord."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -281,8 +281,7 @@ msgstr ""
 "live-persist misslyckades med att Ã¥terge kod {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -293,7 +292,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/sw/sw.po b/sw/sw.po
index 0e92b8e..7156a7f 100644
--- a/sw/sw.po
+++ b/sw/sw.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/szl/szl.po b/szl/szl.po
index f77ac7c..11261e0 100644
--- a/szl/szl.po
+++ b/szl/szl.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Silesian (https://www.transifex.com/otf/teams/1519/szl/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ta/ta.po b/ta/ta.po
index fc66993..ae8a1b6 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jose moses antony <jmsanto123@xxxxxxxx>, 2016\n"
 "Language-Team: Tamil (https://www.transifex.com/otf/teams/1519/ta/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à®®à¯?à®´à®¿"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "à®?à®©à¯?à®¤à¯?à®¤à¯? à®¨à¯?à®?à¯?à®µà¯?à®¾à®°à¯?à®?à¯?à®?à®¿à®?à¯?à®?à¯? à®®à¯?à®?à®?à¯?à®?à¯?"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "à®?à¯?à®°à¯?"
-
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "à®?à¯?à®°à¯?"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/te/te.po b/te/te.po
index 78dcff9..bab5277 100644
--- a/te/te.po
+++ b/te/te.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Telugu (https://www.transifex.com/otf/teams/1519/te/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po
index 5738615..15558df 100644
--- a/te_IN/te_IN.po
+++ b/te_IN/te_IN.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Telugu (India) (https://www.transifex.com/otf/teams/1519/te_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/templates/tails-greeter-2.pot b/templates/tails-greeter-2.pot
index 159c8e7..b719c16 100644
--- a/templates/tails-greeter-2.pot
+++ b/templates/tails-greeter-2.pot
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -90,88 +90,104 @@ msgstr "Spoof all MAC addresses (default)"
 msgid "Don't spoof MAC addresses"
 msgstr "Don't spoof MAC addresses"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cannot unlock encrypted storage with this passphrase."
+
+#: ../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."
+
+#: ../data/greeter.ui.h:19
 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:19
+#: ../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"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Language & Region"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Default Settings"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Save Language & Region Settings"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Language"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "Keyboard Layout"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Formats"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Encrypted Persistent Storage"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Show Passphrase"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Configure Persistent Storage"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Enter your passphrase to unlock the persistent storage"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Unlock"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "Relock Persistent Storage"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../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."
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Additional Settings"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Save Additional Settings"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Add an additional setting"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Network Configuration"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -181,19 +197,19 @@ msgstr ""
 "configure a Tor bridge or a local proxy. To work completely offline, you can"
 " disable all networking."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Connect directly to the Tor network (default)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Configure a Tor bridge, firewall, or proxy settings"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Disable all networking"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -201,79 +217,63 @@ msgstr ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Off (default)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "On (default)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Network Connection"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Direct (default)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Offline"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Unlockingâ?¦"
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Add"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Back"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Unlockingâ?¦"
-
-#: ../tailsgreeter/gui.py:680
-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."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "On"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "Off"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Start Tails"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Offline"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr "default:LTR"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Cannot unlock encrypted storage with this passphrase."
-
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -282,8 +282,7 @@ msgstr ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -294,7 +293,18 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"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:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/tg/tg.po b/tg/tg.po
index d160559..f2921d8 100644
--- a/tg/tg.po
+++ b/tg/tg.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Tajik (https://www.transifex.com/otf/teams/1519/tg/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/th/th.po b/th/th.po
index 4339e52..6f4c7cb 100644
--- a/th/th.po
+++ b/th/th.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: kanesayan gwangsai <thailand.1.2009.00067.77.9@xxxxxxxxx>, 2016\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "à¸¢à¸´à¸?à¸?à¸µà¸?à¹?à¸à¸?à¸£à¸±à¸?à¸ªà¸¹à¹? Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "à¸ à¸²à¸©à¸²à¹?à¸¥à¸°à¸ à¸¹à¸¡à¸´à¸ à¸²à¸?"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "à¸ à¸²à¸©à¸²"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "à¹?à¸?à¸?à¹?à¸§à¸¥à¸²"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "à¸?à¸¥à¸?à¸¥à¹?à¸à¸?"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢"
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "à¹?à¸?à¸·à¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¸¢à¸?à¸£à¸?à¹?à¸?à¸¢à¸±à¸?à¹?à¸?à¸£à¸·à¸à¸?à¹?à¸²à¸¢à¸?à¸à¸£à¹? (à¹?à¸?à¸¢à¸?à¸£à¸´à¸¢à¸²à¸¢)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "à¸?à¸´à¸? (à¹?à¸?à¸¢à¸?à¸£à¸´à¸¢à¸²à¸¢)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "à¹?à¸?à¸´à¸? (à¹?à¸?à¸¢à¸?à¸£à¸´à¸¢à¸²à¸¢)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "à¸à¸à¸?à¹?à¸¥à¸?à¹?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "à¸?à¸³à¸¥à¸±à¸?à¸?à¸¥à¸?à¸¥à¹?à¸à¸?..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "à¸¢à¸?à¹?à¸¥à¸´à¸?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "à¹?à¸?à¸´à¹?à¸¡"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "à¸?à¸¥à¸±à¸?"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "à¸?à¸³à¸¥à¸±à¸?à¸?à¸¥à¸?à¸¥à¹?à¸à¸?..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "à¸?à¸´à¸?"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "à¸à¸à¸?à¹?à¸¥à¸?à¹?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ti/ti.po b/ti/ti.po
index 7189c02..f4ea1cf 100644
--- a/ti/ti.po
+++ b/ti/ti.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Tigrinya (https://www.transifex.com/otf/teams/1519/ti/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/tk/tk.po b/tk/tk.po
index dc3bfd2..5a9042d 100644
--- a/tk/tk.po
+++ b/tk/tk.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Turkmen (https://www.transifex.com/otf/teams/1519/tk/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/tr/tr.po b/tr/tr.po
index eeea36f..78a7ccf 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yasin Ã?zel <iletisim@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
@@ -91,87 +91,103 @@ msgstr "TÃ¼m MAC adresleri yanÄ±ltÄ±lsÄ±n (varsayÄ±lan)"
 msgid "Don't spoof MAC addresses"
 msgstr "MAC adresleri yanÄ±ltÄ±lmasÄ±n"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Bu parola ile Å?ifreli depolama alanÄ±nÄ±n kilidi aÃ§Ä±lamadÄ±."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Bir aÄ?a baÄ?landÄ±ktan sonra Tor kÃ¶prÃ¼sÃ¼ ya da yerel vekil sunucu "
+"kullanabilirsiniz."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "Tails UygulamasÄ±na HoÅ? Geldiniz!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr "Tails ayarlarÄ±nÄ± yapmak iÃ§in yukarÄ±dan <b>Tura KatÄ±lÄ±n</b>"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "Dil ve BÃ¶lge"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "VarsayÄ±lan Ayarlar"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "Dil ve BÃ¶lge AyarlarÄ±nÄ± Kaydet"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Dil"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "TuÅ? TakÄ±mÄ± DÃ¼zeni"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "BiÃ§imler"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "Saat Dilimi"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Å?ifreli KalÄ±cÄ± Depolama"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Parola GÃ¶rÃ¼ntÃ¼lensin"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "KalÄ±cÄ± Depolama AyarlarÄ±"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "KalÄ±cÄ± depolamanÄ±n kilidini aÃ§mak iÃ§in parolanÄ±zÄ± yazÄ±n"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Kilidi AÃ§"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "KalÄ±cÄ± DepolamayÄ± Yeniden Kilitle"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Ek Ayarlar"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "Ek AyarlarÄ± Kaydet"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "Ek bir ayar ekle"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "AÄ? AyarlarÄ±"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -182,19 +198,19 @@ msgstr ""
 "kullanabilirsiniz. Tamamen Ã§evrim dÄ±Å?Ä± Ã§alÄ±Å?mak iÃ§in tÃ¼m aÄ?larÄ± devre dÄ±Å?Ä± "
 "bÄ±rakabilirsiniz."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "DoÄ?rudan Tor aÄ?Ä±na baÄ?lanÄ±lsÄ±n (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Bir Tor kÃ¶pÃ¼rÃ¼sÃ¼, gÃ¼venlik duvarÄ± ya da vekil sunucu kulllanÄ±lsÄ±n"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "TÃ¼m aÄ? devre dÄ±Å?Ä± bÄ±rakÄ±lsÄ±n"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -202,79 +218,63 @@ msgstr ""
 "Ã?oÄ?u durum iÃ§in varsayÄ±lan ayarlarÄ± kullanmak en gÃ¼venlisidir. Ã?zel bir ayar"
 " eklemek iÃ§in aÅ?aÄ?Ä±daki \"+\" dÃ¼Ä?mesine tÄ±klayÄ±n."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "KapalÄ± (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "AÃ§Ä±k (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "AÄ? BaÄ?lantÄ±sÄ±"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "DoÄ?rudan (varsayÄ±lan)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Kapat"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Tails BaÅ?latÄ±lsÄ±n"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ã?evrim DÄ±Å?Ä±"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Kilit aÃ§Ä±lÄ±yor..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ekle"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Geri"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Kilit aÃ§Ä±lÄ±yor..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Bir aÄ?a baÄ?landÄ±ktan sonra Tor kÃ¶prÃ¼sÃ¼ ya da yerel vekil sunucu "
-"kullanabilirsiniz."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "AÃ§Ä±k"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "KapalÄ±"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Kapat"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ã?evrim DÄ±Å?Ä±"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Tails BaÅ?latÄ±lsÄ±n"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Bu parola ile Å?ifreli depolama alanÄ±nÄ±n kilidi aÃ§Ä±lamadÄ±."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -283,8 +283,7 @@ msgstr ""
 "live-persist Å?u hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -295,7 +294,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/tzm/tzm.po b/tzm/tzm.po
index 0d8492e..86bbc31 100644
--- a/tzm/tzm.po
+++ b/tzm/tzm.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Central Atlas Tamazight (https://www.transifex.com/otf/teams/1519/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -81,190 +81,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -272,7 +271,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ug@Arab/ug@xxxxxxx b/ug@Arab/ug@xxxxxxx
index 8e1ad3a..0a95261 100644
--- a/ug@Arab/ug@xxxxxxx
+++ b/ug@Arab/ug@xxxxxxx
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: crash x <xmr.crashx@xxxxxxxxx>, 2016\n"
 "Language-Team: Uighur (Arabic) (https://www.transifex.com/otf/teams/1519/ug@Arab/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ø§Ù?Ù?ØºØ©"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ø¥Ù?ØºØ§Ø¡"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ø¥Ø¶Ø§Ù?Ø©"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/uk/uk.po b/uk/uk.po
index bf8696f..97b1902 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Konstantin Tiler <inactive+tilersever@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ð?Ð¾Ð²Ð°"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ð²Ñ?Ñ? Ð·'Ñ?Ð´Ð°Ð½Ð½Ñ?"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr ""
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ð?Ñ?Ð»Ð°Ð¹Ð½"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr ""
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°Ñ?Ñ?Ð²Ð°Ñ?Ð¸"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ð?Ñ?Ð»Ð°Ð¹Ð½"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ur/ur.po b/ur/ur.po
index edac2e4..7207525 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: A. Saad Imran <ad_min96@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Urdu (https://www.transifex.com/otf/teams/1519/ur/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "ØªÙ?Ø³Û?Ø® Ú©Û?Ø¬Û?Û?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "ØªÙ?Ø³Û?Ø® Ú©Û?Ø¬Û?Û?"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ur_PK/ur_PK.po b/ur_PK/ur_PK.po
index 562fe00..69a5ca3 100644
--- a/ur_PK/ur_PK.po
+++ b/ur_PK/ur_PK.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Muhammad Ishaq <ishaq@xxxxxxxxx>, 2016\n"
 "Language-Team: Urdu (Pakistan) (https://www.transifex.com/otf/teams/1519/ur_PK/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Ø²Ø¨Ø§Ù?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Ø¨Ù?Ø¯Ú¾ Ú©Ø±Û?Úº"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Ù?Ù?Ø³Ù?Ø®"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ø§Ù?Ù? Ù?Ø§Ø¦Ù?"
 
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
-msgstr "Ù¾Û?Ú?Ú¾Û?"
-
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Ù?Ù?Ø³Ù?Ø®"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr ""
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
+msgstr "Ù¾Û?Ú?Ú¾Û?"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Ø¨Ù?Ø¯Ú¾ Ú©Ø±Û?Úº"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ø§Ù?Ù? Ù?Ø§Ø¦Ù?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/uz/uz.po b/uz/uz.po
index d04ce67..a0cd372 100644
--- a/uz/uz.po
+++ b/uz/uz.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Umidjon Almasov <u.almasov@xxxxxxxxx>, 2016\n"
 "Language-Team: Uzbek (https://www.transifex.com/otf/teams/1519/uz/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "Til"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Bekor qilish"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Bekor qilish"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/ve/ve.po b/ve/ve.po
index eeb83b0..f9c0468 100644
--- a/ve/ve.po
+++ b/ve/ve.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Venda (https://www.transifex.com/otf/teams/1519/ve/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/vi/vi.po b/vi/vi.po
index 9cc3223..d6f8dbe 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Acooldude <chibqc@xxxxxxxxx>, 2016\n"
 "Language-Team: Vietnamese (https://www.transifex.com/otf/teams/1519/vi/)\n"
@@ -90,12 +90,24 @@ msgstr "LÃ m giáº£ táº¥t cáº£ Ä?á»?a chá»? MAC (máº·c Ä?á»?nh)"
 msgid "Don't spoof MAC addresses"
 msgstr "KhÃ´ng lÃ m giáº£ Ä?á»?a chá»? MAC"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "KhÃ´ng thá»? má»? khÃ³a vÃ¹ng lÆ°u trá»¯ bá»? mÃ£ hÃ³a vá»?i máºt kháº©u nÃ y."
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+"Báº¡n sáº½ cáº¥u hÃ¬nh cáº§u ná»?i Tor vÃ  á»§y quyá»?n ná»?i bá»? sau khi káº¿t ná»?i tá»?i má»?t máº¡ng "
+"lÆ°á»?i."
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "ChÃ o má»«ng Ä?áº¿n vá»?i Tails!"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
@@ -103,76 +115,80 @@ msgstr ""
 "Ä?á»? Ä?Æ°á»£c hÆ°á»?ng dáº«n vá»? nhá»¯ng cÃ i Ä?áº·t cá»§a Tails, báº¥m chuá»?t vÃ o <b>Take a "
 "Tour</b> á»? trÃªn"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "NgÃ´n ngá»¯ vÃ  VÃ¹ng"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t vá»? ngÃ´n ngá»¯ vÃ  vÃ¹ng"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "NgÃ´n ngá»¯"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "CÃ¡ch bá»? trÃ bÃ n phÃm"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "Nhá»¯ng khuÃ´n máº«u"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "MÃºi giá»?"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "Dung lÆ°á»£ng bá»?n vá»¯ng Ä?Æ°á»£c mÃ£ hÃ³a"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "Hiá»?n thá»? Ä?oáº¡n máºt kháº©u"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "Cáº¥u hÃ¬nh dung lÆ°á»£ng bá»?n vá»¯ng"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Nháºp máºt kháº©u cá»§a báº¡n Ä?á»? má»? khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "Má»? khÃ³a"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "KhÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "Nhá»¯ng cÃ i Ä?áº·t thÃªm"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t thÃªm"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "Cáº¥u hÃ¬nh máº¡ng lÆ°á»?i"
 
-#: ../data/greeter.ui.h:37
+#: ../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"
@@ -182,19 +198,19 @@ msgstr ""
 "thá»? cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor hoáº·c á»§y quyá»?n ná»?i bá»?. Ä?á»? lÃ m viá»?c hoÃ n toÃ n "
 "ngoáº¡i tuyáº¿n, báº¡n cÃ³ thá»? vÃ´ hiá»?u má»?i máº¡ng lÆ°á»?i."
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "Káº¿t ná»?i trá»±c tiáº¿p tá»?i máº¡ng lÆ°á»?i Tor (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "Cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor, tÆ°á»?ng lá»a, hoáº·c nhá»¯ng cÃ i Ä?áº·t á»§y quyá»?n"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "VÃ´ hiá»?u táº¥t cáº£ máº¡ng lÆ°á»?i"
 
-#: ../data/greeter.ui.h:41
+#: ../data/greeter.ui.h:44
 msgid ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
@@ -202,79 +218,63 @@ msgstr ""
 "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh lÃ  an toÃ n trong háº§u háº¿t tÃ¬nh huá»?ng. Ä?á»? thÃªm nhá»¯ng "
 "cÃ i Ä?áº·t riÃªng, báº¥m nÃºt \"+\" bÃªn dÆ°á»?i."
 
-#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "Táº¯t (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "Má»? (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "Káº¿t ná»?i máº¡ng lÆ°á»?i"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "Trá»±c tiáº¿p (máº·c Ä?á»?nh)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Táº¯t trÃ¬nh duyá»?t"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "Cáº§u ná»?i & á»¦y quyá»?n"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "Khá»?i Ä?á»?ng Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "Ngoáº¡i tuyáº¿n"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "Tháº¥t báº¡i khi khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "Ä?ang má»? khÃ³a..."
+
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "Huá»· bá»?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "ThÃªm vÃ o"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "Trá»? vá»?"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "Ä?ang má»? khÃ³a..."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-"Báº¡n sáº½ cáº¥u hÃ¬nh cáº§u ná»?i Tor vÃ  á»§y quyá»?n ná»?i bá»? sau khi káº¿t ná»?i tá»?i má»?t máº¡ng "
-"lÆ°á»?i."
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "Báºt"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "táº¯t"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "Tháº¥t báº¡i khi khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i."
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "Cáº§u ná»?i & á»¦y quyá»?n"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Táº¯t trÃ¬nh duyá»?t"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "Ngoáº¡i tuyáº¿n"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "Khá»?i Ä?á»?ng Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "KhÃ´ng thá»? má»? khÃ³a vÃ¹ng lÆ°u trá»¯ bá»? mÃ£ hÃ³a vá»?i máºt kháº©u nÃ y."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -283,8 +283,7 @@ msgstr ""
 "live-persit tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? {returncode}:\n"
 " {stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -295,7 +294,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/wa/wa.po b/wa/wa.po
index c30ca2a..2d6857e 100644
--- a/wa/wa.po
+++ b/wa/wa.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Walloon (https://www.transifex.com/otf/teams/1519/wa/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/wo/wo.po b/wo/wo.po
index fcba7d5..c57ff22 100644
--- a/wo/wo.po
+++ b/wo/wo.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Wolof (https://www.transifex.com/otf/teams/1519/wo/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 079e8c4..299508e 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: khi <tsaizb@xxxxxxxxx>, 2016\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
@@ -84,182 +84,182 @@ msgstr "æ¬ºéª?æ??æ?? MAC å?°å??ï¼?é»?è®¤ï¼?"
 msgid "Don't spoof MAC addresses"
 msgstr "ä¸?æ¬ºéª?ä»»ä½? MAC å?°å??"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "æ? æ³?ç?¨æ¤å¯?ç ?è§£é??å? å¯?ç??å?å?¨ã??"
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "æ?¨å°?å?¨ç¨?å??è¿?æ?¥å?°ç½?ç»?å??é??ç½® Tor ç½?æ¡¥å??æ?¬å?°ä»£ç??è®¾ç½®ã??"
+
+#: ../data/greeter.ui.h:19
 msgid "Welcome to Tails!"
 msgstr "æ¬¢è¿?ä½¿ç?¨ Tailsï¼?"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr "è¦?è?·å?? Tails è®¾ç½®ç??æ??å??ï¼?ç?¹å?»ä¸?é?¢ç??<b>å¯¼è§?</b>"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "è¯è¨?å??å?ºå??"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "é»?è®¤è®¾ç½®"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "ä¿?å?è¯è¨?å??å?ºå??è®¾ç½®"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "è¯è¨?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "é?®ç??å¸?å±?"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "æ ¼å¼?"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "æ?¶å?º"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "å? å¯?æ??ä¹?å?å?¨"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "æ?¾ç¤ºå¯?ç ?"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "é??ç½®æ??ä¹?å?å?¨"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "è¯·è¾?å?¥æ?¨ç??å¯?ç ?ä»¥è§£é??æ??ä¹?å?å?¨"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "è§£é??"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "é¢?å¤?è®¾ç½®"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "ä¿?å?é¢?å¤?è®¾ç½®"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "æ·»å? ä¸?ä¸ªé¢?å¤?è®¾ç½®"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "ç½?ç»?é??ç½®"
 
-#: ../data/greeter.ui.h:37
+#: ../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 "å¦?æ??æ?¨ç??äº?è??ç½?è¿?æ?¥å??å?°å®¡æ?¥ã??è¿?æ»¤æ??è??é??è¿?ä»£ç??æ??å?¡å?¨ï¼?æ?¨å?¯ä»¥é??ç½®ä¸?ä¸ª Tor ç½?æ¡¥æ??æ?¬å?°ä»£ç??ã??è¦?å®?å?¨è?±æ?ºå·¥ä½?ï¼?æ?¨å?¯ä»¥ç¦?ç?¨æ??æ??ç½?ç»?ã??"
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "ç?´æ?¥è¿?æ?¥ Tor ç½?ç»?ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "é??ç½® Tor ç½?æ¡¥ã??é?²ç?«å¢?æ??ä»£ç??è®¾ç½®"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "ç¦?ç?¨æ??æ??ç½?ç»?"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "å?³é?ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "å¼?å?¯ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "ç½?ç»?è¿?æ?¥"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "ç?´æ?¥ï¼?é»?è®¤ï¼?"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "å?³é?"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "ç½?æ¡¥å??ä»£ç??"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "å?¯å?¨ Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "ç¦»çº¿"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨å¤±è´¥ã??"
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "æ£å?¨è§£é??â?¦"
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "æ·»å? "
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "ä¸?ä¸?æ¥"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "æ£å?¨è§£é??â?¦"
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "æ?¨å°?å?¨ç¨?å??è¿?æ?¥å?°ç½?ç»?å??é??ç½® Tor ç½?æ¡¥å??æ?¬å?°ä»£ç??è®¾ç½®ã??"
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "å¼?"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
-msgstr "å?³"
-
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨å¤±è´¥ã??"
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "ç½?æ¡¥å??ä»£ç??"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "å?³é?"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "ç¦»çº¿"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "å?¯å?¨ Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "æ? æ³?ç?¨æ¤å¯?ç ?è§£é??å? å¯?ç??å?å?¨ã??"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -268,8 +268,7 @@ msgstr ""
 "live-persist å¤±è´¥ï¼?è¿?å??ä»£ç ? {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -280,7 +279,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 16eae6c..fe4a6eb 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: å¤§å??æ´?è?¥ <inactive+kinkwok@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Chinese (Hong Kong) (https://www.transifex.com/otf/teams/1519/zh_HK/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "å??ç?¨å?¨é?¨ç¶²çµ¡"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "é?¢é??"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "å??æ¶?"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
-msgstr "å? å?¥"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "é?¢ç·?"
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "å??æ¶?"
 
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
+msgstr "å? å?¥"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "é?¢é??"
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "é?¢ç·?"
-
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index aeb8540..5a651ab 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kai Moffit <mytransifex@xxxxxxxxxx>, 2016\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -83,182 +83,182 @@ msgstr "å?½è£?æ??æ??ç??ç¶²è·¯å?¡å¯¦é«?ä½?å??(é ?è¨)"
 msgid "Don't spoof MAC addresses"
 msgstr "ä¸?è¦?å?½è£?ç¶²è·¯å?¡å¯¦é«?ä½?å??"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "æ¤é??é??å¯?èª?ç?¡æ³?è§£é??å? å¯?ç??å?²å?è£?ç½®ã??"
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 "æ¡è¿?ä½¿ç?¨ Tailsï¼?"
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr "è?¥è¦?é??å°? Tails ç??è¨å®?é?²è¡?å°?è¦½ï¼?è«?é»?é?¸<b>å??è?½å°?è¦½</b>"
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr "èª?è¨?å??å??å??"
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr "é ?è¨å?¼"
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr "å?²å?èª?è¨?è??å??å??ç??è¨å®?å?¼"
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr "é?µç?¤ä½?å±?"
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr "æ ¼å¼?"
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr "æ??å??"
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr "å? å¯?ä¹?æ°¸ä¹?æ?§å?²å?è£?ç½®"
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr "é¡¯ç¤ºé??é??å¯?èª?"
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr "è¨å®?æ°¸ä¹?æ?§å?²å?è£?ç½®"
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "è«?è¼¸å?¥å¯?ç¢¼ä»¥ä¾¿è§£é??æ°¸ä¹?æ?§å?²å?è£?ç½®"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr "è§£é??"
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr "é??æ?°é??å®?æ°¸ä¹?æ?§å?²å?è£?ç½®"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr "é¡?å¤?ç??è¨å®?"
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr "å?²å?é¡?å¤?ç??è¨å®?"
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr "æ·»å? ä¸?å??é¡?å¤?è¨å®?"
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr "ç¶²è·¯è¨å®?"
 
-#: ../data/greeter.ui.h:37
+#: ../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 "è?¥æ?¨æ??ä½¿ç?¨ç??ç¶²è·¯æ??å??é?å?°ç?£æ?§æ??å¯©æ?¥ç??è©±ï¼?å?¯ä»¥è¨å®?ä½¿ç?¨æ´?è?¥è·¯ç?±æ©?æ?¥å?¨ä¾?é?£ä¸?ç¶²è·¯ã??è?¥æ?³è¦?é?¢ç·?ä½?æ¥ç??è©±ï¼?å?¯ä»¥å°?æ??æ??ç¶²è·¯é?£ç·?å??è?½é??é??ã??"
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr "ç?´æ?¥é?£ä¸?æ´?è?¥è·¯ç?±ç¶²è·¯(é ?è¨)"
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr "è¨å®?æ´?è?¥è·¯ç?±æ©?æ?¥å?¨ã??é?²ç?«ç??ã??ä»£ç??è·¯ç?±å?¨"
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr "å??ç?¨æ??æ??ç¶²è·¯"
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr "é??é??(é ?è¨)"
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr "å??ç?¨(é ?è¨)"
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr "ç¶²è·¯é?£ç·?"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr "ç?´æ?¥(é ?è¨)"
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "é??é??"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
+msgstr "æ©?æ?¥å?¨è??ä»£ç??ä¼ºæ??å?¨"
 
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
-msgstr "å??å?? Tails"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
+msgstr "é?¢ç·?"
+
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
+msgstr "æ°¸ä¹?æ?§å?²å?è£?ç½®é??æ?°é??å®?å¤±æ??ã??"
+
+#: ../tailsgreeter/gui.py:481
+msgid "Unlockingâ?¦"
+msgstr "è§£é??ä¸...."
 
-#: ../tailsgreeter/gui.py:523
+#: ../tailsgreeter/gui.py:562
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../tailsgreeter/gui.py:527
+#: ../tailsgreeter/gui.py:566
 msgid "Add"
 msgstr "æ?°å¢?"
 
-#: ../tailsgreeter/gui.py:534
+#: ../tailsgreeter/gui.py:572
 msgid "Back"
 msgstr "è¿?å??"
 
-#: ../tailsgreeter/gui.py:652
-msgid "Unlockingâ?¦"
-msgstr "è§£é??ä¸...."
-
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "ç?¶æ?¨é?£æ?¥ä¸?ç¶²è·¯ä¹?å¾?ï¼?å°?æ??é??è¦?è¨å®?æ´?è?¥è·¯ç?±æ©?æ?¥å?¨è??æ?¬å?°ç«¯ä»£ç??ä¼ºæ??å?¨ã??"
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr "å??å??"
-
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
 msgstr "é??é??"
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
-msgstr "æ°¸ä¹?æ?§å?²å?è£?ç½®é??æ?°é??å®?å¤±æ??ã??"
-
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr "æ©?æ?¥å?¨è??ä»£ç??ä¼ºæ??å?¨"
-
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
-msgstr "é?¢ç·?"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
+msgstr "å??å?? Tails"
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "æ¤é??é??å¯?èª?ç?¡æ³?è§£é??å? å¯?ç??å?²å?è£?ç½®ã??"
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
+msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -267,8 +267,7 @@ msgstr ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -279,7 +278,15 @@ msgstr ""
 "{stdout}\n"
 "{stderr}"
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
diff --git a/zu/zu.po b/zu/zu.po
index f560c99..4d302a6 100644
--- a/zu/zu.po
+++ b/zu/zu.po
@@ -1,14 +1,14 @@
-# Tails GDM Greeter
-# Copyright (C) 2016 Tails devlopers
-# This file is distributed under the same license as the tails-greeter package.
-# Tails devloppers <tails@xxxxxxxx>, 2016.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-03 13:14+0000\n"
+"POT-Creation-Date: 2017-01-31 10:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Zulu (https://www.transifex.com/otf/teams/1519/zu/)\n"
@@ -82,190 +82,189 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr ""
+
+#: ../data/greeter.ui.h:18
+msgid ""
+"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 ""
 
 #. This string will never be displayed in the 1st version of the greeter.
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:21
 msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:20
+#: ../data/greeter.ui.h:22
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:23
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
+#: ../data/greeter.ui.h:24
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Language"
 msgstr ""
 
-#: ../data/greeter.ui.h:24
+#: ../data/greeter.ui.h:26
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:27
 msgid "Formats"
 msgstr ""
 
-#: ../data/greeter.ui.h:26
+#: ../data/greeter.ui.h:28
 msgid "Time Zone"
 msgstr ""
 
-#: ../data/greeter.ui.h:27
+#: ../data/greeter.ui.h:29
 msgid "Encrypted Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:28
+#: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
 msgstr ""
 
-#: ../data/greeter.ui.h:29
+#: ../data/greeter.ui.h:31
 msgid "Configure Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:30
+#: ../data/greeter.ui.h:32
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798
-#: ../tailsgreeter/gui.py:962
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
+#: ../tailsgreeter/gui.py:510
 msgid "Unlock"
 msgstr ""
 
-#: ../data/greeter.ui.h:32
+#: ../data/greeter.ui.h:34
 msgid "Relock Persistent Storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:35
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
 msgid "Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:34
+#: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:35
+#: ../data/greeter.ui.h:38
 msgid "Add an additional setting"
 msgstr ""
 
-#: ../data/greeter.ui.h:36
+#: ../data/greeter.ui.h:39
 msgid "Network Configuration"
 msgstr ""
 
-#: ../data/greeter.ui.h:37
+#: ../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 ""
 
-#: ../data/greeter.ui.h:38
+#: ../data/greeter.ui.h:41
 msgid "Connect directly to the Tor network (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:39
+#: ../data/greeter.ui.h:42
 msgid "Configure a Tor bridge, firewall, or proxy settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:40
+#: ../data/greeter.ui.h:43
 msgid "Disable all networking"
 msgstr ""
 
-#: ../data/greeter.ui.h:41
+#: ../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:42 ../tailsgreeter/gui.py:717
+#: ../data/greeter.ui.h:45
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715
+#: ../data/greeter.ui.h:46
 msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:44
+#: ../data/greeter.ui.h:47
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914
+#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:456
-msgid "Shutdown"
-msgstr "Shutdown"
-
-#: ../tailsgreeter/gui.py:462
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:373
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:523
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../tailsgreeter/gui.py:527
-msgid "Add"
+#: ../tailsgreeter/gui.py:379
+msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:534
-msgid "Back"
+#: ../tailsgreeter/gui.py:463
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:652
+#: ../tailsgreeter/gui.py:481
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:680
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:720
-msgid "On"
-msgstr ""
+#: ../tailsgreeter/gui.py:562
+msgid "Cancel"
+msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:722
-msgid "Off"
+#: ../tailsgreeter/gui.py:566
+msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:801
-msgid "Failed to relock persistent storage."
+#: ../tailsgreeter/gui.py:572
+msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:920
-msgid "Bridge & Proxy"
-msgstr ""
+#: ../tailsgreeter/gui.py:658
+msgid "Shutdown"
+msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:926
-msgid "Offline"
+#: ../tailsgreeter/gui.py:664
+msgid "Start Tails"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:965
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: ../tailsgreeter/language.py:119
+msgid "default:LTR"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:96
+#: ../tailsgreeter/persistence.py:89
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163
-#: ../tailsgreeter/persistence.py:186
+#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -273,7 +272,15 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: ../tailsgreeter/persistence.py:206
+#: ../tailsgreeter/persistence.py:154
+#, python-brace-format
+msgid ""
+"live-persist failed with return code {returncode}:\n"
+"{stdout}\n"
+"{stderr}"
+msgstr ""
+
+#: ../tailsgreeter/persistence.py:168
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"

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

Prev by Author: [tor-commits] [translation/torbirdy] Update translations for torbirdy
Next by Author: [tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
Next by thread: [tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2
Index(es):
- Author
- Thread