[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: Sat, 3 Dec 2016 09:49:27 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 03 Dec 2016 04:50:38 -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 de438ab413ba16e67c4a3bc9c05a16a72c65ecba
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sat Dec 3 09:49:24 2016 +0000

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

diff --git a/ach/ach.po b/ach/ach.po
index 5b43f50..736dd6c 100644
--- a/ach/ach.po
+++ b/ach/ach.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ady/ady.po b/ady/ady.po
index c421a76..82495f1 100644
--- a/ady/ady.po
+++ b/ady/ady.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/af/af.po b/af/af.po
index 2f32bfc..e76d891 100644
--- a/af/af.po
+++ b/af/af.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ak/ak.po b/ak/ak.po
index 9d3c3b3..9af6155 100644
--- a/ak/ak.po
+++ b/ak/ak.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/am/am.po b/am/am.po
index 46e9ac4..80be592 100644
--- a/am/am.po
+++ b/am/am.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ar/ar.po b/ar/ar.po
index 7f5594a..9255eae 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "ØªØ®Ù?Ù? Ù?Ù?Ø¸Ø§Ù? ØªØ´ØºÙ?Ù? Ù?Ù?Ù?Ø¯Ù?Ø²"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ø§Ù?Ù?ØºÙ?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ø§Ù?Ù?Ù?Ø§Ù?Ø§Øª Ø§Ù?Ù?ØªØØ¯Ø© Ø§Ù?Ø£Ù?Ø±Ù?Ù?Ù?Ø©"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/arn/arn.po b/arn/arn.po
index eef510f..f963521 100644
--- a/arn/arn.po
+++ b/arn/arn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ast/ast.po b/ast/ast.po
index 6cf59a0..b2ac9d8 100644
--- a/ast/ast.po
+++ b/ast/ast.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/az/az.po b/az/az.po
index 0ea1bba..dce1e26 100644
--- a/az/az.po
+++ b/az/az.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ba/ba.po b/ba/ba.po
index e308bef..9b91c78 100644
--- a/ba/ba.po
+++ b/ba/ba.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/be/be.po b/be/be.po
index c48920f..4bbee00 100644
--- a/be/be.po
+++ b/be/be.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ð?Ð¾Ð²Ð°"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/bg/bg.po b/bg/bg.po
index a013bba..b2fdf2b 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Ð?Ð°Ð¼Ñ?Ñ?Ð»Ð°Ð¶"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ð?Ð·Ð¸Ðº"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ð¡Ñ?ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸ Ð°Ð¼ÐµÑ?Ð¸ÐºÐ°Ð½Ñ?ÐºÐ¸ Ñ?Ð°Ñ?Ð¸"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ð?Ð·Ð²Ñ?Ð½ Ð»Ð¸Ð½Ð¸Ñ?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/bn/bn.po b/bn/bn.po
index a0c5845..e4a1cba 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à¦à¦¾à¦·à¦¾"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po
index 6767465..15f9109 100644
--- a/bn_BD/bn_BD.po
+++ b/bn_BD/bn_BD.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/bn_IN/bn_IN.po b/bn_IN/bn_IN.po
index 0e0f13b..ecb4e2b 100644
--- a/bn_IN/bn_IN.po
+++ b/bn_IN/bn_IN.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/bo/bo.po b/bo/bo.po
index 1cf5a8c..e2d1f72 100644
--- a/bo/bo.po
+++ b/bo/bo.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/br/br.po b/br/br.po
index e2a9275..1ff6e8c 100644
--- a/br/br.po
+++ b/br/br.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/brx/brx.po b/brx/brx.po
index 164de16..762ac2f 100644
--- a/brx/brx.po
+++ b/brx/brx.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/bs/bs.po b/bs/bs.po
index fc01fa9..a9d8d77 100644
--- a/bs/bs.po
+++ b/bs/bs.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ca/ca.po b/ca/ca.po
index 0a6f94d..4e58440 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ian Martorell <ianmartorell@xxxxxxxxx>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Camuflatge de Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Llengua"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Estats Units"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Fora de lÃnia"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ceb/ceb.po b/ceb/ceb.po
index f990b02..f3ae780 100644
--- a/ceb/ceb.po
+++ b/ceb/ceb.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/cs/cs.po b/cs/cs.po
index 479d039..5213422 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows KamuflÃ¡Å¾"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "United States"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/csb/csb.po b/csb/csb.po
index a60ba1e..7d4b09b 100644
--- a/csb/csb.po
+++ b/csb/csb.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/cv/cv.po b/cv/cv.po
index 071db5a..28fe061 100644
--- a/cv/cv.po
+++ b/cv/cv.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/cy/cy.po b/cy/cy.po
index 1a48950..4a9c495 100644
--- a/cy/cy.po
+++ b/cy/cy.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Iaith"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Unol Daleithiau"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/da/da.po b/da/da.po
index 0713382..558edb5 100644
--- a/da/da.po
+++ b/da/da.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Sprog"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "USA"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/de/de.po b/de/de.po
index f2e3e25..c3b5a73 100644
--- a/de/de.po
+++ b/de/de.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -48,11 +48,13 @@ msgstr "BestÃ¤tigen Sie Ihr Administrationspasswort"
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows-Tarnung"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -60,15 +62,16 @@ msgstr ""
 "Diese Option lÃ¤sst Tails aussehen wie Microsoft Windows 10. Dies kann "
 "nÃ¼tzlich sein beim Vermeiden von Verdacht an Ã¶ffentlichen Orten."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10-Tarnung"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Manipulation der MAC-Adresse"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,69 +83,55 @@ msgstr ""
 "hilft dabei, Ihren geografischen Standort geheim zu halten. Aber es kann "
 "auch zu Verbindungsproblemen fÃ¼hren oder verdÃ¤chtig wirken."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "MAC-Adressen nicht manipulieren"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Willkommen bei Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "Um eine FÃ¼hrung durch die Einstellungen von Tails zu erhalten, oben <b>Take "
 "a Tour</b> klicken."
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Sprache & Region"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Vorgabeeinstellungen"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Sprache & Regionseinstellungen speichern"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Sprache"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Englisch"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Tastaturbelegung"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Englisch (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formate"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Vereinigten Staaten"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Zeitzone"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "VerschlÃ¼sselte bestÃ¤ndige Datenpartition"
@@ -161,8 +150,8 @@ msgstr ""
 "Geben Sie Ihre Passphrase ein, um die bestÃ¤ndige Datenpartition zu "
 "entsperren"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Entsperren"
 
@@ -179,8 +168,8 @@ msgid "Save Additional Settings"
 msgstr "ZusÃ¤tzliche Einstellungen speichern"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "toolbutton"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -220,11 +209,11 @@ msgstr ""
 "benutzerdefinierte Einstellungen vorzunehmen, drÃ¼cken Sie unten auf die "
 "SchaltflÃ¤che \"+\"."
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Aus (Vorgabe)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "Ein (Vorgabe)"
 
@@ -232,7 +221,7 @@ msgstr "Ein (Vorgabe)"
 msgid "Network Connection"
 msgstr "Netzwerkverbindung"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Direkt (Vorgabe)"
 
@@ -268,36 +257,27 @@ msgstr ""
 "Die Tor BrÃ¼cke und den lokalen Vermittlungsserver (Proxy) spÃ¤ter nach dem "
 "Verbinden mit dem Netzwerk konfigurieren."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "Ein"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Aus"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (Vorgabe)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "Sie kÃ¶nnen einen verschlÃ¼sselten Speicher einrichten."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "BestÃ¤ndige Datenpartition konnte nicht wieder gesperrt werden."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "BrÃ¼cke & Vermittlungsserver"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "VerschlÃ¼sselter Speicher kann mit dieser Passphrase nicht entsperrt werden."
diff --git a/dz/dz.po b/dz/dz.po
index 6c95189..7b4d30b 100644
--- a/dz/dz.po
+++ b/dz/dz.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/el/el.po b/el/el.po
index b4129ac..71ba918 100644
--- a/el/el.po
+++ b/el/el.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Î?Î±Î¼Î¿Ï?Ï?Î»Î¬Î¶ Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Î?Î»Ï?Ï?Ï?Î±"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Î?Î½Ï?Î¼ÎÎ½ÎµÏ? Î Î¿Î»Î¹Ï?ÎµÎ¯ÎµÏ?"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Î?ÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 9bece46..d482a4c 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Language"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/eo/eo.po b/eo/eo.po
index 4f478e0..498afc7 100644
--- a/eo/eo.po
+++ b/eo/eo.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robin van der Vliet <info@xxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Esperanto (https://www.transifex.com/otf/teams/1519/eo/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Lingvo"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Usono"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/es/es.po b/es/es.po
index 07a18fd..546678f 100644
--- a/es/es.po
+++ b/es/es.po
@@ -1,16 +1,16 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
+"Last-Translator: strel <strelnic@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,11 +48,13 @@ msgstr "Confirme su contraseÃ±a de administrador"
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Camuflaje como Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -60,15 +62,16 @@ msgstr ""
 "Esta opciÃ³n hace que Tails parezca Microsoft Windows 10. Esto puede resultar"
 " Ãºtil para no llamar la atenciÃ³n en lugares pÃºblicos."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Camuflaje como Microsoft Windows 10"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "FalsificaciÃ³n de la direcciÃ³n MAC"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -81,69 +84,55 @@ msgstr ""
 "geogrÃ¡fica. Pero tambiÃ©n podrÃa crear problemas de conectividad o parecer "
 "sospechosa."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Falsificar todas las direcciones MAC (predeterminado)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "No falsificar las direcciones MAC "
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Â¡Bienvenido a Tails! "
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "Para hacer una visita guiada a la configuraciÃ³n de Tails, pulse <b>Hacer un "
 "recorrido</b> "
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Idioma y regiÃ³n "
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "ConfiguraciÃ³n por defecto"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Guardar la configuraciÃ³n regional y de idioma"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "InglÃ©s"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Mapa del teclado"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "InglÃ©s (EEUU)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formatos "
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Estados Unidos"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Zona horaria "
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC "
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Almacenamiento cifrado permanente"
@@ -161,8 +150,8 @@ 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Desbloquear "
 
@@ -179,8 +168,8 @@ msgid "Save Additional Settings"
 msgstr "Guardar configuraciones adicionales "
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "botÃ³n de herramientas"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -217,11 +206,11 @@ 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
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Desactivado (predeterminado) "
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "Activado (predeterminado) "
 
@@ -229,7 +218,7 @@ msgstr "Activado (predeterminado) "
 msgid "Network Connection"
 msgstr "ConexiÃ³n a la red "
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Directa (predeterminado) "
 
@@ -264,36 +253,27 @@ msgid ""
 msgstr ""
 "ConfigurarÃ¡ el puente Tor y el proxy local, despuÃ©s de conectarse a la red."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "Activado "
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Desactivado "
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (predeterminado)  "
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "TendrÃa la capacidad de establecer un almacenamiento cifrado. "
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "No se pudo volver a bloquear el almacenamiento permanente."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Puente y proxy "
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "No se puede desbloquear el almacenamiento cifrado con esta contraseÃ±a."
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 1785445..e8b3e43 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/es_CL/es_CL.po b/es_CL/es_CL.po
index efd6a45..e515293 100644
--- a/es_CL/es_CL.po
+++ b/es_CL/es_CL.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/es_CO/es_CO.po b/es_CO/es_CO.po
index 2a3131a..7cf2a49 100644
--- a/es_CO/es_CO.po
+++ b/es_CO/es_CO.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po
index 0edf756..f66e4ab 100644
--- a/es_MX/es_MX.po
+++ b/es_MX/es_MX.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Arturo J. Gueta Lozano <arturo@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/otf/teams/1519/es_MX/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Lenguaje"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/et/et.po b/et/et.po
index 19cbbd0..3950f44 100644
--- a/et/et.po
+++ b/et/et.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/eu/eu.po b/eu/eu.po
index 0e5cff2..2f8a4ba 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Estatu Batuak"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Lineaz kanpo"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fa/fa.po b/fa/fa.po
index 52742b9..3230b0e 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Ù¾Ù?Ø´Ø´ Ù?Û?Ù?Ø¯Ù?Ø²"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ø²Ø¨Ø§Ù?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ø§Û?Ø§Ù?Ø§Øª Ù?ØªØØ¯Ù?"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ø¢Ù?Ù?Ø§Û?Ù?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fi/fi.po b/fi/fi.po
index 5040a02..406f4da 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows-naamiointi"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Kieli"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Yhdysvallat"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Poissa verkosta"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fil/fil.po b/fil/fil.po
index b8d5fa0..cf01fc7 100644
--- a/fil/fil.po
+++ b/fil/fil.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fo/fo.po b/fo/fo.po
index 46b4d6b..0fd6e1a 100644
--- a/fo/fo.po
+++ b/fo/fo.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fr/fr.po b/fr/fr.po
index 66411cb..c6b9723 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -48,25 +48,28 @@ msgstr "Confirmer votre mot de passe d'administration"
 msgid "Disable"
 msgstr "DÃ©sactiver"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Camouflage Microsoft Windows 10"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Usurpation d'adresse MAC"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -74,67 +77,53 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Langue & Pays"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "rÃ©glages par dÃ©faut"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Sauvegarder les paramÃ¨tres de Langue & Pays"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Langue"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Anglais"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Disposition du clavier"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Anglais (USA)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formats"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ã?tats-Unis"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Fuseau horaire"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr ""
@@ -151,8 +140,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -169,7 +158,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -201,11 +190,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -213,7 +202,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr "Connection rÃ©seau"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -247,36 +236,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po
index 6a090a6..00735d0 100644
--- a/fr_CA/fr_CA.po
+++ b/fr_CA/fr_CA.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Camouflage Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Langue"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fur/fur.po b/fur/fur.po
index a33d486..429503e 100644
--- a/fur/fur.po
+++ b/fur/fur.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/fy/fy.po b/fy/fy.po
index 1be2e7c..93c5fc3 100644
--- a/fy/fy.po
+++ b/fy/fy.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ga/ga.po b/ga/ga.po
index bd39eff..f9c1f02 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/gd/gd.po b/gd/gd.po
index 71ef549..9ce8d72 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/gl/gl.po b/gl/gl.po
index c1923fe..cbf6394 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Camuflaxe de Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Estados Unidos"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/gu/gu.po b/gu/gu.po
index 9fb4ac8..d5d2260 100644
--- a/gu/gu.po
+++ b/gu/gu.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/gu_IN/gu_IN.po b/gu_IN/gu_IN.po
index 2aa5b99..f912a08 100644
--- a/gu_IN/gu_IN.po
+++ b/gu_IN/gu_IN.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/gun/gun.po b/gun/gun.po
index 10b87b9..2206eac 100644
--- a/gun/gun.po
+++ b/gun/gun.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ha/ha.po b/ha/ha.po
index 70726db..7c89f18 100644
--- a/ha/ha.po
+++ b/ha/ha.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/he/he.po b/he/he.po
index 991b76c..02a7e7c 100644
--- a/he/he.po
+++ b/he/he.po
@@ -1,16 +1,16 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: ION <bobiganush@xxxxxxxxx>, 2016\n"
+"Last-Translator: GenghisKhan <genghiskhan@xxxxxx>, 2016\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "×?×¡×?×?×?×? ×©×? Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "×©×¤×?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "×?×¨×¦×?×ª ×?×?×¨×?×ª"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "×?×? ×?×§×?×?×?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/hi/hi.po b/hi/hi.po
index 9592f88..3f7a4d7 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à¤à¤¾à¤·à¤¾"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "à¤?à¤®à¥?à¤°à¤¿à¤?à¤¾"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/hr/hr.po b/hr/hr.po
index 975a80f..c653963 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index a5a5ee5..5c0f54d 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -48,11 +48,13 @@ msgstr "Potvrdite svoju administratorsku lozinku"
 msgid "Disable"
 msgstr "OnemoguÄ?i"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows maskiranje"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -60,15 +62,16 @@ msgstr ""
 "Ova opcija maskira Tails da izgleda kao Windows 10. Ta opcija moÅ¾e biti "
 "korisna kako bi izbjegli sumnju na javnim mjestima."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 kamuflaÅ¾a"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Maskiranje MAC adrese"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,68 +83,54 @@ msgstr ""
 "sigurnije jer Vam pomaÅ¾e da sakrijete svoju geografsku lokaciju, ali moÅ¾e "
 "stvoriti probleme sa vezom ili izazvati sumnju."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Maskiraj sve MAC adrese (zadano)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "Ne maskiraj MAC adrese"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "DobrodoÅ¡li u Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+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:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Jezik i regija"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Zadane postavke"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Spremite postavke jezika i regije"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Engleski"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Postavke tipkovnice"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Engleski (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formati"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Sjedinjene AmeriÄ?ke DrÅ¾ave"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Vremenska zona"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Enkriptirana trajna pohrana"
@@ -158,8 +147,8 @@ msgstr "Postavi trajnu pohranu"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "OtkljuÄ?aj"
 
@@ -176,8 +165,8 @@ msgid "Save Additional Settings"
 msgstr "Spremi dodatne postavke"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "toolbutton"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -213,11 +202,11 @@ msgstr ""
 "Zadane postavke su sigurne u veÄ?ini situacija. Kako bi dodali prilagoÄ?ene "
 "postavke, stisnite \"+\" gumb."
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "IskljuÄ?eno (zadano)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "UkljuÄ?eno (zadano)"
 
@@ -225,7 +214,7 @@ msgstr "UkljuÄ?eno (zadano)"
 msgid "Network Connection"
 msgstr "MreÅ¾na veza"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Direktno (zadano)"
 
@@ -261,36 +250,27 @@ msgstr ""
 "Konfigurirat Ä?e te Tor most i lokalni proxy kasnije, nakon spajanja na "
 "mreÅ¾u."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "UkljuÄ?eno"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "IskljuÄ?eno"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (zadano)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "MoÅ¾ete postaviti enkriptiranu pohranu."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "Nije uspjelo zakljuÄ?avanje trajne pohrane."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Most i proxy"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ne mogu otkljuÄ?ati enkriptiranu pohranu s ovom lozinkom."
 
diff --git a/ht/ht.po b/ht/ht.po
index 1d86a0b..af95b0b 100644
--- a/ht/ht.po
+++ b/ht/ht.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/hu/hu.po b/hu/hu.po
index fbdb2ca..b7f8d2e 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Ã¡lcÃ¡zÃ¡s"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Nyelv"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "EgyesÃ¼lt Ã?llamok"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/hy/hy.po b/hy/hy.po
index e5beb1b..eca90c0 100644
--- a/hy/hy.po
+++ b/hy/hy.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ia/ia.po b/ia/ia.po
index e3cb81f..e31e567 100644
--- a/ia/ia.po
+++ b/ia/ia.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Linguage"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Statos Unite de America"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Foras de linea"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/id/id.po b/id/id.po
index fcc3f83..c30d09f 100644
--- a/id/id.po
+++ b/id/id.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: adhisuryo i <adhisuryo@xxxxxxxxx>, 2016\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Kamuflase Jendela"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Bahasa"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Amerika Serikat"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Luring"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/is/is.po b/is/is.po
index 26cb6e5..e9abce6 100644
--- a/is/is.po
+++ b/is/is.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "TungumÃ¡l"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/it/it.po b/it/it.po
index 714ea46..1f5f57d 100644
--- a/it/it.po
+++ b/it/it.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Mimetizzazione Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Lingua"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Stati Uniti"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Non in linea"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ja/ja.po b/ja/ja.po
index 7e6c7e1..d694d1c 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tokumei Nanashi <anon_japan@xxxxxxxxxx>, 2016\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windowsã?«ã?¢ã??ã?©ã?¼ã?¸ã?¥"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "è¨?èª?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "ã?¢ã?¡ã?ªã?«å??è¡?å?½"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/jv/jv.po b/jv/jv.po
index 651b316..ded6520 100644
--- a/jv/jv.po
+++ b/jv/jv.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ka/ka.po b/ka/ka.po
index 00a9039..c44b61d 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "á??á??á??"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "á??á??á?¡á?£á??á?? á?¥á?¡á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/kk/kk.po b/kk/kk.po
index 65f3f18..c19711d 100644
--- a/kk/kk.po
+++ b/kk/kk.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/km/km.po b/km/km.po
index ce622ba..cb35956 100644
--- a/km/km.po
+++ b/km/km.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "á??á?¶á??á?¶"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/kn/kn.po b/kn/kn.po
index 1cddb97..1ef9b46 100644
--- a/kn/kn.po
+++ b/kn/kn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "à²µà²¿à²?à²¡à³?à²¸à³? à²®à²¾à²¯à²¾à²?à²¾à²²"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à²à²¾à²·à³?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ko/ko.po b/ko/ko.po
index 9fe2be7..692128d 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dr.what <javrick6@xxxxxxxxx>, 2016\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "ì?¸ì?´"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "ë¯¸êµ"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "ì?¤í??ë?¼ì?¸"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po
index e80f5e5..e5d107f 100644
--- a/ko_KR/ko_KR.po
+++ b/ko_KR/ko_KR.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "ì?¸ì?´"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "ë¯¸êµ"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "ì?¤í??ë?¼ì?¸"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ku/ku.po b/ku/ku.po
index 5bac215..c187e95 100644
--- a/ku/ku.po
+++ b/ku/ku.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po
index f583fe1..b1bb0af 100644
--- a/ku_IQ/ku_IQ.po
+++ b/ku_IQ/ku_IQ.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ø²Ù?Ø§Ù?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ø¯Û?Ø±Ù?Û?Úµ"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/kw/kw.po b/kw/kw.po
index cdab82b..943eb0e 100644
--- a/kw/kw.po
+++ b/kw/kw.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ky/ky.po b/ky/ky.po
index 0cca155..d056a2a 100644
--- a/ky/ky.po
+++ b/ky/ky.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/la/la.po b/la/la.po
index 8c46b9e..188eead 100644
--- a/la/la.po
+++ b/la/la.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Lingua"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/lb/lb.po b/lb/lb.po
index df9b7f0..aa79535 100644
--- a/lb/lb.po
+++ b/lb/lb.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Sprooch"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/lg/lg.po b/lg/lg.po
index ec8e54c..8704716 100644
--- a/lg/lg.po
+++ b/lg/lg.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ln/ln.po b/ln/ln.po
index 48a8254..821d93e 100644
--- a/ln/ln.po
+++ b/ln/ln.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/lo/lo.po b/lo/lo.po
index 8e27563..70adefa 100644
--- a/lo/lo.po
+++ b/lo/lo.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/lt/lt.po b/lt/lt.po
index 64c88a6..7ff4b2a 100644
--- a/lt/lt.po
+++ b/lt/lt.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -48,11 +48,13 @@ msgstr "Patvirtinkite savo administravimo slaptaÅ¾odÄ¯"
 msgid "Disable"
 msgstr "IÅ¡jungti"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows maskuotÄ?"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -60,15 +62,16 @@ msgstr ""
 "Å i parinktis padaro taip, kad Tails atrodytÅ³ lyg Microsoft Windows 10. Tai "
 "gali praversti vieÅ¡ose vietose, siekiant iÅ¡vengti Ä¯tarimÅ³."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 maskuotÄ?"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "MAC adresÅ³ klastojimas"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,67 +83,53 @@ msgstr ""
 "saugesnis, kadangi padeda nuslÄ?pti jÅ«sÅ³ geografinÄ? vietÄ?. TaÄ?iau jis taip "
 "pat gali sukelti ryÅ¡io problemÅ³ arba atrodyti Ä¯tartinai."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Klastoti visus MAC adresus (numatytasis)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "Neklastoti MAC adresus"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Sveiki atvykÄ? Ä¯ Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Kalba ir regionas"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Numatytieji nustatymai"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Ä®raÅ¡yti kalbos ir regiono nustatymus"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Kalba"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "AnglÅ³"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "KlaviatÅ«ros iÅ¡dÄ?stymas"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "AnglÅ³ (JAV)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formatai"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "JungtinÄ?s Amerikos Valstijos"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Laiko juosta"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "Suderintasis pasaulinis laikas (UTC)"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Å ifruotas ilgalaikis kaupiklis"
@@ -157,8 +146,8 @@ msgstr "KonfigÅ«ruoti ilgalaikÄ¯ kaupiklÄ¯"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Atrakinti"
 
@@ -175,7 +164,7 @@ msgid "Save Additional Settings"
 msgstr "Ä®raÅ¡yti papildomus nustatymus"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -214,11 +203,11 @@ msgstr ""
 "Numatytieji nustatymai daugelyje situacijÅ³ yra saugÅ«s. NorÄ?dami pridÄ?ti "
 "tinkintÄ? nustatymÄ?, Å¾emiau spustelÄ?kite mygtukÄ? \"+\"."
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -226,7 +215,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr "Tinklo ryÅ¡ys"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Tiesioginis (numatytasis)"
 
@@ -262,36 +251,27 @@ msgstr ""
 "JÅ«s sukonfigÅ«ruosite Tor tinklÅ³ tiltÄ? ir vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯ vÄ?liau, "
 "po prisijungimo prie tinklo."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (numatytasis)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "Nepavyko iÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
 
diff --git a/lv/lv.po b/lv/lv.po
index 1e44ae2..d9133e7 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -47,11 +47,13 @@ msgstr "Apstipriniet savu administrÄ?Å¡anas paroli"
 msgid "Disable"
 msgstr "AtspÄ?jot"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows kamuflÄ?Å¾a"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -59,15 +61,16 @@ msgstr ""
 "Å Ä« iespÄ?ja padara Tails pÄ?c izskata lÄ«dzÄ«gÄ?ku Microsoft Windows 10. Tas var "
 "bÅ«t derÄ«gi publiskÄ?s vietÄ?s, lai izvairÄ«tos no aizdomu radÄ«Å¡anas."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 kamuflÄ?Å¾a"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "MAC adreses maldinoÅ¡a maiÅ?a"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,69 +83,55 @@ msgstr ""
 "vietu. TaÄ?u tÄ? var izraisÄ«t arÄ« savienojamÄ«bas problÄ?mas vai izskatÄ«ties "
 "aizdomÄ«ga."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "MaldinoÅ¡i norÄ?dÄ«t visas MAC adreses (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "MaldinoÅ¡i nenorÄ?dÄ«t MAC adreses"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "SveicinÄ?ti Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "Lai uzzinÄ?tu vairÄ?k par Tails iestatÄ«jumiem, noklikÅ¡Ä·iniet uz "
 "<b>IepazÄ«stieties</b> augstÄ?k."
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Valoda un reÄ£ions"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "NoklusÄ?juma iestatÄ«jumi"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "SaglabÄ?t valodas un reÄ£iona iestatÄ«jumus"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Valoda"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "AngÄ¼u"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "TastatÅ«ras izkÄ?rtojums"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "AngÄ¼u (ASV)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "FormÄ?ti"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Amerikas SavienotÄ?s Valstis"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Laika zonas"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UKL"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Å ifrÄ?ta pastÄ?vÄ«gÄ? krÄ?tuve"
@@ -159,8 +148,8 @@ msgstr "KonfigurÄ?t pastÄ?vÄ«go krÄ?tuvi"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "AtslÄ?gt"
 
@@ -177,8 +166,8 @@ msgid "Save Additional Settings"
 msgstr "SaglabÄ?t papildu iestatÄ«jumus"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "rÄ«kupoga"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -214,11 +203,11 @@ 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
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "IzslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
@@ -226,7 +215,7 @@ msgstr "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 msgid "Network Connection"
 msgstr "TÄ«kla savienojumi"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "TieÅ¡s (noklusÄ?juma vÄ?rtÄ«ba)"
 
@@ -262,36 +251,27 @@ 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:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "IeslÄ?gt"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "IzslÄ?gt"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (noklusÄ?juma vÄ?rtÄ«ba)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "JÅ«s varÄ?tu izveidot Å¡ifrÄ?tu krÄ?tuvi."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "NeizdevÄ?s atkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Tilti un starpniekserveri"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "BezsaistÄ?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
 
diff --git a/mg/mg.po b/mg/mg.po
index 6356c32..7bb6af2 100644
--- a/mg/mg.po
+++ b/mg/mg.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/mi/mi.po b/mi/mi.po
index e46f08d..83bedba 100644
--- a/mi/mi.po
+++ b/mi/mi.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/mk/mk.po b/mk/mk.po
index e35a51d..799188e 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ml/ml.po b/ml/ml.po
index 52a2435..73e9286 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/mn/mn.po b/mn/mn.po
index c8b825f..5da10f5 100644
--- a/mn/mn.po
+++ b/mn/mn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/mr/mr.po b/mr/mr.po
index a1610ff..c5cb6be 100644
--- a/mr/mr.po
+++ b/mr/mr.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po
index 44579a5..922c403 100644
--- a/ms_MY/ms_MY.po
+++ b/ms_MY/ms_MY.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Penyamaran Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Bahasa"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/mt/mt.po b/mt/mt.po
index edcefe0..21a470b 100644
--- a/mt/mt.po
+++ b/mt/mt.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/my/my.po b/my/my.po
index 4bc4f17..c41633c 100644
--- a/my/my.po
+++ b/my/my.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "á??á?¬á??á?¬á??á??á?¬á?¸"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "á?¡á??á?±â??á??á?â??á??á??á?ºâ??á??á?¼á??á?ºá??á?±á?¬á??á?ºá??á?¯"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "á?¡á?±á?¬á?·á??á?ºá??á?á?¯á??á?ºá?¸"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nah/nah.po b/nah/nah.po
index 6348a5f..735c76d 100644
--- a/nah/nah.po
+++ b/nah/nah.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nap/nap.po b/nap/nap.po
index 296ed2b..b8affcf 100644
--- a/nap/nap.po
+++ b/nap/nap.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nb/nb.po b/nb/nb.po
index bc3e8e4..37965ee 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -47,11 +47,13 @@ msgstr "Bekreft ditt administrasjonspassord"
 msgid "Disable"
 msgstr "Skru av"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows-kamuflasje"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -59,15 +61,16 @@ msgstr ""
 "Dette valget gjÃ¸r at Tails ettaper Microsoft Windows 10. Dette kan vÃ¦re "
 "nyttig i offentlige rom for Ã¥ unngÃ¥ Ã¥ tiltrekke seg mistanke."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10-kamuflasje"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Simuler MAC-adresse"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,69 +83,55 @@ msgstr ""
 "skjule din geografiske plassering. Men det kan ogsÃ¥ forÃ¥rsake "
 "tilkoblingsproblemer eller se mistenkelig ut."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Simuler alle MAC-adresser (forvalg)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "Ikke simuler MAC-adresser"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Velkommen til Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "For Ã¥ bli veiledet gjennom Tails innstillinger, klikk <b>Ã?pne veiledning</b>"
 " ovenfor"
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "SprÃ¥k og region"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Forvalgte innstillinger"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Lagre sprÃ¥k- og regions -innstillinger"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Engelsk"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Tastauroppsett"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Engelsk (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formater"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Amerikas Forente Stater"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Kryptert vedvarende lagring"
@@ -159,8 +148,8 @@ msgstr "Sett opp vedvarende lagring"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "LÃ¥s opp"
 
@@ -177,8 +166,8 @@ msgid "Save Additional Settings"
 msgstr "Lagre ytterligere innstillinger"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "verktÃ¸ysknapp"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -215,11 +204,11 @@ msgstr ""
 "De forvalgte innstillingene er trygg i de fleste fall. For Ã¥ legge til en "
 "egendefinert innstilling, trykk \"+\"-knappen nedenfor."
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Av (forvalg)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "PÃ¥ (forvalg)"
 
@@ -227,7 +216,7 @@ msgstr "PÃ¥ (forvalg)"
 msgid "Network Connection"
 msgstr "Nettverkstilkobling"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Direkte (forvalg)"
 
@@ -263,36 +252,27 @@ msgstr ""
 "Du vil sette opp Tor-broen og lokal mellomtjener senere etter Ã¥ ha koblet "
 "til et nettverk."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "Av"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "PÃ¥"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (forvalg)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "Du vil vÃ¦re i stand til Ã¥ sette opp kryptert lagring."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "Klarte ikke Ã¥ lÃ¥se vedvarende lagring igjen."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Bro og mellomtjener"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Kan ikke lÃ¥se opp kryptert lagring med denne passordsekvensen."
 
diff --git a/nds/nds.po b/nds/nds.po
index 0e5a77d..3813b04 100644
--- a/nds/nds.po
+++ b/nds/nds.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ne/ne.po b/ne/ne.po
index 1de78a1..5579ff5 100644
--- a/ne/ne.po
+++ b/ne/ne.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nl/nl.po b/nl/nl.po
index c09238d..5bf4f03 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Roy Jacobs <admin@xxxxxxxxxx>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
@@ -45,11 +45,13 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -58,15 +60,16 @@ msgstr ""
 "minder op en zal men minder argwaan krijgen wanneer je op een openbare "
 "plaats bent."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -74,65 +77,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Verenigde Staten"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -151,8 +140,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -169,7 +158,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -201,11 +190,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -213,7 +202,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -247,36 +236,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
index 32efd25..6a099fd 100644
--- a/nl_BE/nl_BE.po
+++ b/nl_BE/nl_BE.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Taal"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nn/nn.po b/nn/nn.po
index caf7238..991be88 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr "Stadfest admin-passordet ditt"
 msgid "Disable"
 msgstr "SlÃ¥ av"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,67 +74,53 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Velkomen til Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Standard-innstillingar"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Engelsk"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Engelsk (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Format"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr ""
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr ""
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Fjern blokkering"
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Av (standard)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "PÃ¥ (standard)"
 
@@ -210,7 +199,7 @@ msgstr "PÃ¥ (standard)"
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "PÃ¥"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Av"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "FrÃ¥kopla"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/nso/nso.po b/nso/nso.po
index 7abce69..9c73eda 100644
--- a/nso/nso.po
+++ b/nso/nso.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/oc/oc.po b/oc/oc.po
index 17e5b1c..005737a 100644
--- a/oc/oc.po
+++ b/oc/oc.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/om/om.po b/om/om.po
index a8b1643..1ca6ba0 100644
--- a/om/om.po
+++ b/om/om.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/or/or.po b/or/or.po
index 6ada218..778d05f 100644
--- a/or/or.po
+++ b/or/or.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/pa/pa.po b/pa/pa.po
index 164835f..28dd3e5 100644
--- a/pa/pa.po
+++ b/pa/pa.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/pap/pap.po b/pap/pap.po
index fe757e2..90dcb71 100644
--- a/pap/pap.po
+++ b/pap/pap.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/pl/pl.po b/pl/pl.po
index 90954f3..5f8dea0 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: sebx <sebastiansz@xxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "KamuflaÅ¼ Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "JÄ?zyk"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Stany Zjednoczone"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Poza zasiÄ?giem"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/pms/pms.po b/pms/pms.po
index b862f40..c32e203 100644
--- a/pms/pms.po
+++ b/pms/pms.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ps/ps.po b/ps/ps.po
index fdec6e7..8d98969 100644
--- a/ps/ps.po
+++ b/ps/ps.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/pt/pt.po b/pt/pt.po
index 951f424..381a48d 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: AndrÃ© Monteiro <andre.monteir@xxxxxxxxx>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/otf/teams/1519/pt/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Estados Unidos"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Desligado da rede"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 5a37152..f97823f 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: m4lqu1570 <>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
@@ -47,11 +47,13 @@ msgstr "Confirmar a sua senha de administraÃ§Ã£o"
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Camuflagem Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -59,15 +61,16 @@ msgstr ""
 "Esta opÃ§Ã£o faz o Tails parecer-se com o Microsoft Windows 10, o que pode ser"
 " Ãºtil para evitar suspeitas em lugares pÃºblicos.  "
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Camuflagem Microsoft Windows 10"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Mascaragem de identidade de endereÃ§os MAC"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,68 +83,54 @@ msgstr ""
 "localizaÃ§Ã£o geogrÃ¡fica. PorÃ©m, essa opÃ§Ã£o pode gerar problemas de conexÃ£o ou"
 " parecer suspeita."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Marcarar a identidade de todos os endereÃ§os MAC (padrÃ£o)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "NÃ£o mascarar a identidade de endereÃ§os MAC"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Boas-vindas ao Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+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:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Idioma & RegiÃ£o"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "ConfiguraÃ§Ãµes PadrÃ£o"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Salva ConfiguraÃ§Ãµes de Idioma & RegiÃ£o"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Idioma"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "InglÃªs"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Modelo de Teclado"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "InglÃªs (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formatos"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Estados Unidos"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Zona HorÃ¡ria"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "Tempo Universal Coordenado (UTC)"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Armazenamento Criptografado Persistent"
@@ -160,8 +149,8 @@ msgstr ""
 "Inserir a sua frase-senha para abrir o dispositivo de armazenamento "
 "Persistent"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Abrir"
 
@@ -178,8 +167,8 @@ msgid "Save Additional Settings"
 msgstr "Salvar ConfiguraÃ§Ãµes Adicionais"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "botÃ£o de ferramentas"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -215,11 +204,11 @@ 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
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Desativar (padrÃ£o)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "Ativar (padrÃ£o)"
 
@@ -227,7 +216,7 @@ msgstr "Ativar (padrÃ£o)"
 msgid "Network Connection"
 msgstr "ConexÃ£o de Rede"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Direta (padrÃ£o)"
 
@@ -263,37 +252,27 @@ msgstr ""
 "VocÃª irÃ¡ configurar uma ponte Tor e um proxy local apÃ³s conectar-se a uma "
 "rede."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "Ativar"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Desativar"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (padrÃ£o)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-"VocÃª poderia configurar um dispositivo de armazenamento criptografado."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "Falha ao fechar de novo o dispositivo de armazenamento Persistent ."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Ponte & Proxy"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "NÃ£o foi possÃvel abrir o dispositivo de armazenamento criptografado com esta"
diff --git a/ro/ro.po b/ro/ro.po
index f4a9785..01a73a0 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: clopotel <yo_sergiu05@xxxxxxxxx>, 2016\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "LimbÄ?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Statele Unite"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Deconectat"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ru/ru.po b/ru/ru.po
index ff5ae1f..912dd9f 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -48,11 +48,13 @@ msgstr "Ð?Ð¾Ð´Ñ?Ð²ÐµÑ?Ð´Ð¸Ñ?Ðµ Ð²Ð°Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
 msgid "Disable"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Ð?Ð°Ñ?ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ° Ð¿Ð¾Ð´ Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -61,15 +63,16 @@ msgstr ""
 "Ð¼Ð¾Ð¶ÐµÑ? Ð±Ñ?Ñ?Ñ? Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ?Ð¼, Ð´Ð»Ñ? Ñ?Ð¾Ð³Ð¾ Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ð·Ð±ÐµÐ¶Ð°Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ð»ÐµÑ?ÐµÐ½Ð¸Ñ? Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ñ? Ð¿Ñ?Ð¸ "
 "Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Ð² Ð¿Ñ?Ð±Ð»Ð¸Ñ?Ð½Ñ?Ñ? Ð¼ÐµÑ?Ñ?Ð°Ñ?."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 ÐºÐ°Ð¼Ñ?Ñ?Ð»Ñ?Ð¶"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -82,68 +85,54 @@ msgstr ""
 "Ð¼ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ. Ð¡Ð»ÐµÐ´Ñ?ÐµÑ? Ð¸Ð¼ÐµÑ?Ñ? Ð² Ð²Ð¸Ð´Ñ?, Ñ?Ñ?Ð¾ Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶ÐµÑ? Ð²Ñ?Ð³Ð»Ñ?Ð´ÐµÑ?Ñ? Ð¿Ð¾Ð´Ð¾Ð·Ñ?Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ð¼"
 " Ð¸ Ð¿Ñ?Ð¸ Ñ?Ñ?Ð¾Ð¼ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ñ? Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸ÐµÐ¼."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° Ð²Ñ?ÐµÑ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "Ð?Ðµ Ð¿Ð¾Ð´Ð¼ÐµÐ½Ñ?Ñ?Ñ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ?Ñ? Ð² Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+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:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Ð¯Ð·Ñ?Ðº Ð¸ Ñ?ÐµÐ³Ð¸Ð¾Ð½"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð·Ñ?Ðº Ð¸ Ñ?ÐµÐ³Ð¸Ð¾Ð½Ð°Ð»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ð¯Ð·Ñ?Ðº"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Ð?Ð½Ð³Ð»Ð¸Ð¹Ñ?ÐºÐ¸Ð¹"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Ð Ð°Ñ?ÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Ð?Ð½Ð³Ð»Ð¸Ð¹Ñ?ÐºÐ¸Ð¹ (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð½Ñ?Ðµ Ð¨Ñ?Ð°Ñ?Ñ?"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Ð§Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
@@ -160,8 +149,8 @@ msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð²Ð°Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ²Ñ?Ñ? Ñ?Ñ?Ð°Ð·Ñ? Ð´Ð»Ñ? Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ð°"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
@@ -178,8 +167,8 @@ msgid "Save Additional Settings"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "ÐºÐ½Ð¾Ð¿ÐºÐ° Ð½Ð° Ð¿Ð°Ð½ÐµÐ»Ð¸"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -216,11 +205,11 @@ msgstr ""
 "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ñ?Ð²Ð»Ñ?Ñ?Ñ?Ñ?Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ð¼Ð¸ Ð² Ð±Ð¾Ð»Ñ?Ñ?Ð¸Ð½Ñ?Ñ?Ð²Ðµ Ñ?Ð¸Ñ?Ñ?Ð°Ñ?Ð¸Ð¹. Ð?Ð»Ñ? "
 "Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¾Ð¹ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸, Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ ÐºÐ½Ð¾Ð¿ÐºÑ? \"+\" Ð½Ð¸Ð¶Ðµ."
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
@@ -228,7 +217,7 @@ msgstr "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 msgid "Network Connection"
 msgstr "Ð¡ÐµÑ?ÐµÐ²Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ð¹ (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
@@ -263,36 +252,27 @@ msgid ""
 msgstr ""
 "Ð?Ñ? Ñ?Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ? Tor Ð¸ Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ñ?Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¿Ð¾Ñ?Ð»Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ðº Ñ?ÐµÑ?Ð¸."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{On_or_off} (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "Ð?Ñ? Ñ?Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ð¾Ð·Ð´Ð°Ñ?Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Ð?Ð¾Ñ?Ñ? Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°ÐµÑ?Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?Ð¾Ð¹ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¾Ð¹ Ñ?Ñ?Ð°Ð·Ð¾Ð¹."
 
diff --git a/ru@petr1708/ru@xxxxxxxxxxx b/ru@petr1708/ru@xxxxxxxxxxx
index e650a89..c0dbb92 100644
--- a/ru@petr1708/ru@xxxxxxxxxxx
+++ b/ru@petr1708/ru@xxxxxxxxxxx
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/scn/scn.po b/scn/scn.po
index c616bae..0a6d1e4 100644
--- a/scn/scn.po
+++ b/scn/scn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sco/sco.po b/sco/sco.po
index 5da2b0f..25b00db 100644
--- a/sco/sco.po
+++ b/sco/sco.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po
index 9f66107..460aa34 100644
--- a/si_LK/si_LK.po
+++ b/si_LK/si_LK.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows à·?à·?â??à¶ºà·?à¶¢ à¶?à·?à¶»à¶«à¶ºà¶?à·? à¶ºà·?à¶¯à·?à·?à¶¸ "
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à¶·à·?à·?à·?à·?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "à¶?à¶?à·?à·?à¶à·? à¶¢à¶±à¶´à¶¯à¶º"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "à¶±à·?à¶¶à·?à¶¯à·?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sk/sk.po b/sk/sk.po
index 7366097..a9f533f 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows KamuflÃ¡Å¾"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "SpojenÃ© Å tÃ¡ty"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "NepripojenÃ½"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index a77927d..9e86150 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sl/sl.po b/sl/sl.po
index d909759..944cee7 100644
--- a/sl/sl.po
+++ b/sl/sl.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sl_SI/sl_SI.po b/sl_SI/sl_SI.po
index 59b14b0..d5f246b 100644
--- a/sl_SI/sl_SI.po
+++ b/sl_SI/sl_SI.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sn/sn.po b/sn/sn.po
index ac8e0e2..70d9fea 100644
--- a/sn/sn.po
+++ b/sn/sn.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/so/so.po b/so/so.po
index 61cbc09..387f5d5 100644
--- a/so/so.po
+++ b/so/so.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/son/son.po b/son/son.po
index a9d03ea..6b91acc 100644
--- a/son/son.po
+++ b/son/son.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sq/sq.po b/sq/sq.po
index 690f3d7..6397c17 100644
--- a/sq/sq.po
+++ b/sq/sq.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Gjuha"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "I shkÃ«putur"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sr/sr.po b/sr/sr.po
index 3e23923..d4ec531 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows kamuflaÅ¾a"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ð¡Ñ?ÐµÐ´Ð¸Ñ?ÐµÐ½Ðµ Ð?Ð¼ÐµÑ?Ð¸Ñ?ÐºÐµ Ð?Ñ?Ð¶Ð°Ð²Ðµ"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ð?Ñ?Ð»Ð°Ñ?Ð½"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sr@latin/sr@xxxxxxxx b/sr@latin/sr@xxxxxxxx
index d723479..b12304d 100644
--- a/sr@latin/sr@xxxxxxxx
+++ b/sr@latin/sr@xxxxxxxx
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows kamuflaÅ¾a"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Jezik"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/st/st.po b/st/st.po
index 055d93d..058b487 100644
--- a/st/st.po
+++ b/st/st.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/su/su.po b/su/su.po
index 9df46f4..bbc049a 100644
--- a/su/su.po
+++ b/su/su.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sv/sv.po b/sv/sv.po
index c64bf62..5b8266a 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jonatan Nyberg <jonatan@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -45,25 +45,28 @@ msgstr "BekrÃ¤fta ditt administration lÃ¶senord"
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows kamouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 kamouflage"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,67 +74,53 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "VÃ¤lkommen till Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "SprÃ¥k & region"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "StandardinstÃ¤llningar"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Spara SprÃ¥k och region instÃ¤llningar"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "SprÃ¥k"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Engelska"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Tangentbordslayout"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Engelska (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Format"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "USA"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Tidszon"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr ""
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "LÃ¥sa upp"
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr "Spara ytterligare instÃ¤llningar"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Av (standard)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "PÃ¥ (standard)"
 
@@ -210,7 +199,7 @@ msgstr "PÃ¥ (standard)"
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "PÃ¥"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Av"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (default)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/sw/sw.po b/sw/sw.po
index fc4d9a0..eb9f780 100644
--- a/sw/sw.po
+++ b/sw/sw.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/szl/szl.po b/szl/szl.po
index 311144f..b2ce7f3 100644
--- a/szl/szl.po
+++ b/szl/szl.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ta/ta.po b/ta/ta.po
index ec2ae93..d6565a7 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "à®µà®¿à®£à¯?à®?à¯?à®¾à®¸à¯? à®?à®°à¯?à®®à®±à¯?à®ªà¯?à®ªà¯?"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à®®à¯?à®´à®¿"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/te/te.po b/te/te.po
index 52f41b5..7145d79 100644
--- a/te/te.po
+++ b/te/te.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po
index c00db30..bb8df50 100644
--- a/te_IN/te_IN.po
+++ b/te_IN/te_IN.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/templates/tails-greeter-2.pot b/templates/tails-greeter-2.pot
index 478d39e..6324fe1 100644
--- a/templates/tails-greeter-2.pot
+++ b/templates/tails-greeter-2.pot
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -47,11 +47,13 @@ msgstr "Confirm your administration password"
 msgid "Disable"
 msgstr "Disable"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -59,15 +61,16 @@ msgstr ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 camouflage"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "MAC Address Spoofing"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -79,68 +82,54 @@ msgstr ""
 " as it helps you hide your geographical location. But it might also create "
 "connectivity problems or look suspicious."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "Spoof all MAC addresses (default)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "Don't spoof MAC addresses"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Welcome to Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+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:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Language & Region"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Default Settings"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Save Language & Region Settings"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Language"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "English"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "Keyboard Layout"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "English (US)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Formats"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "United States"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Time Zone"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Encrypted Persistent Storage"
@@ -157,8 +146,8 @@ msgstr "Configure Persistent Storage"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Unlock"
 
@@ -175,8 +164,8 @@ msgid "Save Additional Settings"
 msgstr "Save Additional Settings"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "toolbutton"
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -212,11 +201,11 @@ msgstr ""
 "The default settings are safe in most situations. To add a custom setting, "
 "press the \"+\" button below."
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Off (default)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "On (default)"
 
@@ -224,7 +213,7 @@ msgstr "On (default)"
 msgid "Network Connection"
 msgstr "Network Connection"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Direct (default)"
 
@@ -260,36 +249,27 @@ msgstr ""
 "You will configure the Tor bridge and local proxy later on after connecting "
 "to a network."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "On"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "Off"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (default)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "You would be able to set up an encrypted storage."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "Failed to relock persistent storage."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Bridge & Proxy"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Cannot unlock encrypted storage with this passphrase."
 
diff --git a/tg/tg.po b/tg/tg.po
index dd231a2..c513cf5 100644
--- a/tg/tg.po
+++ b/tg/tg.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/th/th.po b/th/th.po
index f93ce4d..e0d962a 100644
--- a/th/th.po
+++ b/th/th.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Thai Localization <thailocalization@xxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "à¸?à¸£à¸²à¸?à¸?à¸±à¸§à¹?à¸?à¹?à¸?à¸§à¸´à¸?à¹?à¸?à¸§à¸ªà¹?"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "à¸ à¸²à¸©à¸²"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "à¸ªà¸«à¸£à¸±à¸?à¸à¹?à¸¡à¸£à¸´à¸?à¸²"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "à¸à¸à¸?à¹?à¸¥à¸?à¹?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ti/ti.po b/ti/ti.po
index c045fa2..ad4e98d 100644
--- a/ti/ti.po
+++ b/ti/ti.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/tk/tk.po b/tk/tk.po
index 36de5b1..7e35af2 100644
--- a/tk/tk.po
+++ b/tk/tk.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/tr/tr.po b/tr/tr.po
index 3029627..40a404d 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -47,11 +47,13 @@ msgstr "YÃ¶netim parolasÄ±nÄ± onaylayÄ±n"
 msgid "Disable"
 msgstr "KullanÄ±lmasÄ±n"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Gizlenmesi"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -60,15 +62,16 @@ msgstr ""
 "Ã¶zellik, herkese aÃ§Ä±k yerlerde Å?Ã¼pheli gÃ¶rÃ¼nmekten kaÃ§Ä±nmak iÃ§in kullanÄ±Å?lÄ± "
 "olabilir."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 Gizlenmesi"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "MAC Adresi YanÄ±ltma"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -80,67 +83,53 @@ msgstr ""
 "yardÄ±mcÄ± olacaÄ?Ä±ndan genellikle daha fazla gÃ¼venlik saÄ?lar. Bununla birlikte"
 " baÄ?lanma sorunlarÄ±na ya da Å?Ã¼pheli olarak algÄ±lanmanÄ±za yol aÃ§abilir."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "TÃ¼m MAC adresleri yanÄ±ltÄ±lsÄ±n (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "MAC adresleri yanÄ±ltÄ±lmasÄ±n"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "Tails UygulamasÄ±na HoÅ? Geldiniz!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+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:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "Dil ve BÃ¶lge"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "VarsayÄ±lan Ayarlar"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "Dil ve BÃ¶lge AyarlarÄ±nÄ± Kaydet"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Dil"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Ä°ngilizce"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "TuÅ? TakÄ±mÄ± DÃ¼zeni"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Ä°ngilizce (ABD)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "BiÃ§imler"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "BirleÅ?ik Devletler"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "Saat Dilimi"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Å?ifreli KalÄ±cÄ± Depolama"
@@ -157,8 +146,8 @@ msgstr "KalÄ±cÄ± Depolama AyarlarÄ±"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Kilidi AÃ§"
 
@@ -175,8 +164,8 @@ msgid "Save Additional Settings"
 msgstr "Ek AyarlarÄ± Kaydet"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "aracdugmesi"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -213,11 +202,11 @@ 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
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "KapalÄ± (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "AÃ§Ä±k (varsayÄ±lan)"
 
@@ -225,7 +214,7 @@ msgstr "AÃ§Ä±k (varsayÄ±lan)"
 msgid "Network Connection"
 msgstr "AÄ? BaÄ?lantÄ±sÄ±"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "DoÄ?rudan (varsayÄ±lan)"
 
@@ -261,36 +250,27 @@ msgstr ""
 "Bir aÄ?a baÄ?landÄ±ktan sonra Tor kÃ¶prÃ¼sÃ¼ ya da yerel vekil sunucu "
 "kullanabilirsiniz."
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "AÃ§Ä±k"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "KapalÄ±"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (varsayÄ±lan)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "Å?ifreli bir depolama alanÄ± kullanabilirsiniz."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ã?evrim DÄ±Å?Ä±"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Bu parola ile Å?ifreli depolama alanÄ±nÄ±n kilidi aÃ§Ä±lamadÄ±."
 
diff --git a/tzm/tzm.po b/tzm/tzm.po
index 1cbc9ff..d54303b 100644
--- a/tzm/tzm.po
+++ b/tzm/tzm.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -44,25 +44,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -70,65 +73,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -147,8 +136,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -165,7 +154,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -197,11 +186,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -209,7 +198,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -243,36 +232,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ug@Arab/ug@xxxxxxx b/ug@Arab/ug@xxxxxxx
index 93f33c5..04aff77 100644
--- a/ug@Arab/ug@xxxxxxx
+++ b/ug@Arab/ug@xxxxxxx
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ø§Ù?Ù?ØºØ©"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/uk/uk.po b/uk/uk.po
index eb33bb0..a561000 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Konstantin Tiler <tilersever@xxxxxxxxx>, 2016\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Windows Camouflage"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ð?Ð¾Ð²Ð°"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr ""
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Ð¡Ð¨Ð?"
-
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ð?Ñ?Ð»Ð°Ð¹Ð½"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ur/ur.po b/ur/ur.po
index 02220d0..ef5c75f 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ur_PK/ur_PK.po b/ur_PK/ur_PK.po
index 0a475fe..37c5f07 100644
--- a/ur_PK/ur_PK.po
+++ b/ur_PK/ur_PK.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Ø²Ø¨Ø§Ù?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ø§Ù?Ù? Ù?Ø§Ø¦Ù?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/uz/uz.po b/uz/uz.po
index 988b330..8bc0b00 100644
--- a/uz/uz.po
+++ b/uz/uz.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "Til"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/ve/ve.po b/ve/ve.po
index 9204756..60818be 100644
--- a/ve/ve.po
+++ b/ve/ve.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/vi/vi.po b/vi/vi.po
index a29c918..c1341ec 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -47,11 +47,13 @@ msgstr "XÃ¡c nháºn máºt kháº©u quáº£n trá»? cá»§a báº¡n"
 msgid "Disable"
 msgstr "VÃ´ hiá»?u"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "Ngá»¥y trang Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
@@ -59,15 +61,16 @@ msgstr ""
 "TÃ¹y chá»?n nÃ y lÃ m Tails nhÃ¬n giá»?ng Microsoft Windows 10. Viá»?c nÃ y giÃºp trÃ¡nh "
 "thu hÃºt sá»± nghi ngá»? nÆ¡i cÃ´ng cá»?ng."
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Sá»± ngá»¥y trang Microsoft Windows 10"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "Sá»± lÃ m giáº£ Ä?á»?a chá»? MAC"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -79,69 +82,55 @@ msgstr ""
 "toÃ n Æ¡n vÃ¬ nÃ³ giÃºp báº¡n áº©n vá»? trÃ Ä?á»?a lÃ½ cá»§a mÃ¬nh. NhÆ°ng nÃ³ cÃ³ thá»? táº¡o ra "
 "nhá»¯ng váº¥n Ä?á»? vá»? káº¿t ná»?i hoáº·c trÃ´ng Ä?Ã¡ng nghi ngá»?."
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "LÃ m giáº£ táº¥t cáº£ Ä?á»?a chá»? MAC (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "KhÃ´ng lÃ m giáº£ Ä?á»?a chá»? MAC"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "ChÃ o má»«ng Ä?áº¿n vá»?i Tails!"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 "Ä?á»? Ä?Æ°á»£c hÆ°á»?ng dáº«n vá»? nhá»¯ng cÃ i Ä?áº·t cá»§a Tails, báº¥m chuá»?t vÃ o <b>Take a "
 "Tour</b> á»? trÃªn"
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "NgÃ´n ngá»¯ vÃ  VÃ¹ng"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t vá»? ngÃ´n ngá»¯ vÃ  vÃ¹ng"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "NgÃ´n ngá»¯"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "Tiáº¿ng Anh"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "CÃ¡ch bá»? trÃ bÃ n phÃm"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "Tiáº¿ng Anh (Má»¹)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "Nhá»¯ng khuÃ´n máº«u"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "Má»¹"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "MÃºi giá»?"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "Dung lÆ°á»£ng bá»?n vá»¯ng Ä?Æ°á»£c mÃ£ hÃ³a"
@@ -158,8 +147,8 @@ msgstr "Cáº¥u hÃ¬nh dung lÆ°á»£ng bá»?n vá»¯ng"
 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:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "Má»? khÃ³a"
 
@@ -176,8 +165,8 @@ msgid "Save Additional Settings"
 msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t thÃªm"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "toolbutton"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -213,11 +202,11 @@ 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
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "Táº¯t (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "Má»? (máº·c Ä?á»?nh)"
 
@@ -225,7 +214,7 @@ msgstr "Má»? (máº·c Ä?á»?nh)"
 msgid "Network Connection"
 msgstr "Káº¿t ná»?i máº¡ng lÆ°á»?i"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "Trá»±c tiáº¿p (máº·c Ä?á»?nh)"
 
@@ -261,36 +250,27 @@ 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:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "Báºt"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "táº¯t"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (default)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "Báº¡n sáº½ cÃ³ thá»? cÃ i Ä?áº·t má»?t vÃ¹ng lÆ°u trá»¯ Ä?Æ°á»£c mÃ£ hÃ³a."
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 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:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "Cáº§u ná»?i & á»¦y quyá»?n"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "Ngoáº¡i tuyáº¿n"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 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."
 
diff --git a/wa/wa.po b/wa/wa.po
index 73a724f..5f808e0 100644
--- a/wa/wa.po
+++ b/wa/wa.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/wo/wo.po b/wo/wo.po
index 3168df3..c25067e 100644
--- a/wo/wo.po
+++ b/wo/wo.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index a3e7bda..ecc73fe 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr "è¯·ç¡®è®¤æ?¨ç??ç®¡ç??å??å¯?ç ?"
 msgid "Disable"
 msgstr "ç¦?ç?¨"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "ä¼ªè£? Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr "æ¤é??é¡¹å°?ä½¿ Tails ç??èµ·æ?¥å??æ?¯ Microsoft Windows 10ã??è¿?æ??å?©äº?é?¿å??å?¨å?¬å?±å?ºæ??å¼?èµ·æ³¨æ??ã??"
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "Microsoft Windows 10 ä¼ªè£?"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "MAC å?°å??æ¬ºéª?"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -73,67 +76,53 @@ msgstr ""
 "MAC å?°å??æ¬ºéª?å??æ?¬å?°ç½?ç»?é??è??æ?¨ç??ç½?ç»?æ?¥å?£ï¼?Wi-Fi æ??æ??çº¿ç½?ç»?ï¼?ç??åº?å??å?·ã??æ¬ºéª? MAC "
 "å?°å??é??å¸¸æ?´å®?å?¨ï¼?æ??å?©äº?æ?¨é??è??æ?¨ç??å?°ç??ä½?ç½®ã??ä½?å®?ä¹?å?¯è?½é? æ??è¿?æ?¥é?®é¢?æ??ç??èµ·æ?¥å?¯ç??ã??"
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "æ¬ºéª?æ??æ?? MAC å?°å??ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "ä¸?æ¬ºéª?ä»»ä½? MAC å?°å??"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "æ¬¢è¿?ä½¿ç?¨ Tailsï¼?"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr "è¦?è?·å?? Tails è®¾ç½®ç??æ??å??ï¼?ç?¹å?»ä¸?é?¢ç??<b>å¯¼è§?</b>"
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "è¯è¨?å??å?ºå??"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "é»?è®¤è®¾ç½®"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "ä¿?å?è¯è¨?å??å?ºå??è®¾ç½®"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "è¯è¨?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "è?±è¯"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "é?®ç??å¸?å±?"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "è?±è¯(ç¾?å?½)"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "æ ¼å¼?"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "ç¾?å?½"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "æ?¶å?º"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "å? å¯?æ??ä¹?å?å?¨"
@@ -150,8 +139,8 @@ msgstr "é??ç½®æ??ä¹?å?å?¨"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "è¯·è¾?å?¥æ?¨ç??å¯?ç ?ä»¥è§£é??æ??ä¹?å?å?¨"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "è§£é??"
 
@@ -168,8 +157,8 @@ msgid "Save Additional Settings"
 msgstr "ä¿?å?é¢?å¤?è®¾ç½®"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "å·¥å?·æ??é?®"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -200,11 +189,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr "é»?è®¤è®¾ç½®å?¨å¤§å¤?æ?°æ??å?µä¸?æ?¯å®?å?¨ç??ã??è¦?æ·»å? è?ªå®?ä¹?è®¾ç½®ï¼?ç?¹å?»ä¸?é?¢ç?? + æ??é?®ã??"
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "å?³é?ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "å¼?å?¯ï¼?é»?è®¤ï¼?"
 
@@ -212,7 +201,7 @@ msgstr "å¼?å?¯ï¼?é»?è®¤ï¼?"
 msgid "Network Connection"
 msgstr "ç½?ç»?è¿?æ?¥"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "ç?´æ?¥ï¼?é»?è®¤ï¼?"
 
@@ -246,36 +235,27 @@ msgid ""
 "to a network."
 msgstr "æ?¨å°?å?¨ç¨?å??è¿?æ?¥å?°ç½?ç»?å??é??ç½® Tor ç½?æ¡¥å??æ?¬å?°ä»£ç??è®¾ç½®ã??"
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "å¼?"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "å?³"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off}ï¼?é»?è®¤ï¼?"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "æ?¨å°?å?¯ä»¥è®¾ç½®ä¸?ä¸ªå? å¯?ç??å?å?¨ã??"
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨å¤±è´¥ã??"
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "ç½?æ¡¥å??ä»£ç??"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "ç¦»çº¿"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "æ? æ³?ç?¨æ¤å¯?ç ?è§£é??å? å¯?ç??å?å?¨ã??"
 
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 0640ecd..ad82b76 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "çª?å?£è¿·å½©"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr ""
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr ""
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr ""
-
-#: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
-msgstr ""
-
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr ""
-
-#: ../data/greeter.ui.h:23
-msgid "Formats"
-msgstr ""
-
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "é?¢ç·?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index 25a3fd1..5b0e098 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: AgustÃn Wu <losangwuyts@xxxxxxxxx>, 2016\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -45,25 +45,28 @@ msgstr "ç¢ºèª?æ?¨ç??ç³»çµ±ç®¡ç??å?¡å¯?ç¢¼"
 msgid "Disable"
 msgstr "é??é??"
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr "å?½è£?æ??Windows"
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr "æ¤å??è?½å?¯ä»¥å°? Tails ç??å¤?è§?å?½è£?æ??å¾®è»?ç?? Windows 10ï¼?ä»¥ä¾¿ç?¶æ?¨å?¨å?¬ç?¾å ´æ??ä½¿ç?¨é?»è?¦æ??ï¼?å?¯ä»¥é?¿å??å¼?èµ·æ??äººç??æ³¨æ??ã??"
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr "å¾®è»? Windows 10 å?½è£?"
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr "ç¶²è·¯å?¡å¯¦é«?ä½?å??å?½è£?"
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -72,67 +75,53 @@ msgid ""
 msgstr ""
 "æ¯?å¼µç¶²è·¯å?¡é?½æ??ä¸?å??ç?¨ä¸?ç?¡äº?ç??å¯¦é«?ä½?å??ï¼?å?½è£?æ¤ä½?å??å?¯ä»¥é?¿å??æ?¬å?°ç«¯ç??ç¶²è·¯(ç?¡è«?æ?¯æ??ç·?æ??ç?¡ç·?)å¾?ç?¥æ?¨ç??å¯¦ç??ç¶²è·¯å?¡å¯¦é«?ä½?å??ï¼?é?²è??æ?©é£¾æ?¨å¯¦é??ç??å?°ç??ä½?ç½®ã??ä½?æ?¯å?¨æ??äº?æ??æ³?ä¸ï¼?å?¯è?½æ??é? æ??ç¶²è·¯é?£ç·?ç??å??é¡?ï¼?æ??æ?¯å¢?å? å?¯ç??æ?§ã??"
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr "å?½è£?æ??æ??ç??ç¶²è·¯å?¡å¯¦é«?ä½?å??(é ?è¨)"
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr "ä¸?è¦?å?½è£?ç¶²è·¯å?¡å¯¦é«?ä½?å??"
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr "æ¡è¿?ä½¿ç?¨ Tailsï¼?"
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr "è?¥è¦?é??å°? Tails ç??è¨å®?é?²è¡?å°?è¦½ï¼?è«?é»?é?¸<b>å??è?½å°?è¦½</b>"
 
-#: ../data/greeter.ui.h:16
+#: ../data/greeter.ui.h:20
 msgid "Language & Region"
 msgstr "èª?è¨?å??å??å??"
 
-#: ../data/greeter.ui.h:17
+#: ../data/greeter.ui.h:21
 msgid "Default Settings"
 msgstr "é ?è¨å?¼"
 
-#: ../data/greeter.ui.h:18
+#: ../data/greeter.ui.h:22
 msgid "Save Language & Region Settings"
 msgstr "å?²å?èª?è¨?è??å??å??ç??è¨å®?å?¼"
 
-#: ../data/greeter.ui.h:19
+#: ../data/greeter.ui.h:23
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../data/greeter.ui.h:20
-msgid "English"
-msgstr "è?±æ??"
-
-#: ../data/greeter.ui.h:21
+#: ../data/greeter.ui.h:24
 msgid "Keyboard Layout"
 msgstr "é?µç?¤ä½?å±?"
 
-#: ../data/greeter.ui.h:22
-msgid "English (US)"
-msgstr "ç¾?å¼?è?±æ??"
-
-#: ../data/greeter.ui.h:23
+#: ../data/greeter.ui.h:25
 msgid "Formats"
 msgstr "æ ¼å¼?"
 
-#: ../data/greeter.ui.h:24
-msgid "United States"
-msgstr "ç¾?å??"
-
-#: ../data/greeter.ui.h:25
+#: ../data/greeter.ui.h:26
 msgid "Time Zone"
 msgstr "æ??å??"
 
-#: ../data/greeter.ui.h:26
-msgid "UTC"
-msgstr "UTC"
-
 #: ../data/greeter.ui.h:27
 msgid "Encrypted Persistent Storage"
 msgstr "å? å¯?ä¹?æ°¸ä¹?æ?§å?²å?è£?ç½®"
@@ -149,8 +138,8 @@ msgstr "è¨å®?æ°¸ä¹?æ?§å?²å?è£?ç½®"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "è«?è¼¸å?¥å¯?ç¢¼ä»¥ä¾¿è§£é??æ°¸ä¹?æ?§å?²å?è£?ç½®"
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr "è§£é??"
 
@@ -167,8 +156,8 @@ msgid "Save Additional Settings"
 msgstr "å?²å?é¡?å¤?ç??è¨å®?"
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
-msgstr "å·¥å?·æ??é??"
+msgid "Add an additional setting"
+msgstr ""
 
 #: ../data/greeter.ui.h:36
 msgid "Network Configuration"
@@ -199,11 +188,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr "å?¨å¤§å¤?æ?¸ç??æ??æ³?ä¸?ï¼?é ?è¨ç??è¨å®?å?¼æ?¯å¾?å®?å?¨ç??ã??è?¥æ?¨æ?³è¦?å¢?å? å??äººå??ç??è¨å®?ï¼?è«?æ??ä¸?æ?¹ç??ã??+ã??æ??é??ã??"
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr "é??é??(é ?è¨)"
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr "å??ç?¨(é ?è¨)"
 
@@ -211,7 +200,7 @@ msgstr "å??ç?¨(é ?è¨)"
 msgid "Network Connection"
 msgstr "ç¶²è·¯é?£ç·?"
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr "ç?´æ?¥(é ?è¨)"
 
@@ -245,36 +234,27 @@ msgid ""
 "to a network."
 msgstr "ç?¶æ?¨é?£æ?¥ä¸?ç¶²è·¯ä¹?å¾?ï¼?å°?æ??é??è¦?è¨å®?æ´?è?¥è·¯ç?±æ©?æ?¥å?¨è??æ?¬å?°ç«¯ä»£ç??ä¼ºæ??å?¨ã??"
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr "å??å??"
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr "é??é??"
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr "{on_or_off} (é ?è¨)"
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr "æ?¨å?¯ä»¥è¨å®?ä¸?å??å? å¯?ç??å?²å?è£?ç½®ã??"
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr "æ°¸ä¹?æ?§å?²å?è£?ç½®é??æ?°é??å®?å¤±æ??ã??"
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr "æ©?æ?¥å?¨è??ä»£ç??ä¼ºæ??å?¨"
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr "é?¢ç·?"
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "æ¤é??é??å¯?èª?ç?¡æ³?è§£é??å? å¯?ç??å?²å?è£?ç½®ã??"
 
diff --git a/zu/zu.po b/zu/zu.po
index 444e85c..bbd70f7 100644
--- a/zu/zu.po
+++ b/zu/zu.po
@@ -1,14 +1,14 @@
-# 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.
+# 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.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-18 00:07+0000\n"
+"POT-Creation-Date: 2016-12-02 12:10+0000\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"
@@ -45,25 +45,28 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
-#: ../data/greeter.ui.h:7
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:8
 msgid "Windows Camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:8
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:10
 msgid ""
 "This option makes Tails look like Microsoft Windows 10. This can be useful "
 "to avoid attracting suspiction in public places."
 msgstr ""
 
-#: ../data/greeter.ui.h:9
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:12
 msgid "Microsoft Windows 10 camouflage"
 msgstr ""
 
-#: ../data/greeter.ui.h:10
+#: ../data/greeter.ui.h:13
 msgid "MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:11
+#: ../data/greeter.ui.h:14
 msgid ""
 "MAC address spoofing hides the serial number of your network interface (Wi-"
 "Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
@@ -71,65 +74,51 @@ msgid ""
 "connectivity problems or look suspicious."
 msgstr ""
 
-#: ../data/greeter.ui.h:12
+#: ../data/greeter.ui.h:15
 msgid "Spoof all MAC addresses (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:13
+#: ../data/greeter.ui.h:16
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:14
+#: ../data/greeter.ui.h:17
 msgid "Welcome to Tails!"
 msgstr ""
 
-#: ../data/greeter.ui.h:15
+#. This string will never be displayed in the 1st version of the greeter.
+#: ../data/greeter.ui.h:19
+msgctxt ""
 msgid ""
 "To get guided through Tails' settings, click on <b>Take a Tour</b> above"
 msgstr ""
 
-#: ../data/greeter.ui.h:16
-msgid "Language & Region"
-msgstr ""
-
-#: ../data/greeter.ui.h:17
-msgid "Default Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:18
-msgid "Save Language & Region Settings"
-msgstr ""
-
-#: ../data/greeter.ui.h:19
-msgid "Language"
-msgstr ""
-
 #: ../data/greeter.ui.h:20
-msgid "English"
+msgid "Language & Region"
 msgstr ""
 
 #: ../data/greeter.ui.h:21
-msgid "Keyboard Layout"
+msgid "Default Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:22
-msgid "English (US)"
+msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:23
-msgid "Formats"
+msgid "Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:24
-msgid "United States"
+msgid "Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Time Zone"
+msgid "Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "UTC"
+msgid "Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
@@ -148,8 +137,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:781
-#: ../tailsgreeter/gui.py:942
+#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:767
+#: ../tailsgreeter/gui.py:928
 msgid "Unlock"
 msgstr ""
 
@@ -166,7 +155,7 @@ msgid "Save Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:35
-msgid "toolbutton"
+msgid "Add an additional setting"
 msgstr ""
 
 #: ../data/greeter.ui.h:36
@@ -198,11 +187,11 @@ msgid ""
 "press the \"+\" button below."
 msgstr ""
 
-#: ../data/greeter.ui.h:42
+#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:690
 msgid "Off (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:43
+#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:688
 msgid "On (default)"
 msgstr ""
 
@@ -210,7 +199,7 @@ msgstr ""
 msgid "Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:894
+#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:880
 msgid "Direct (default)"
 msgstr ""
 
@@ -244,36 +233,27 @@ msgid ""
 "to a network."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:698
+#: ../tailsgreeter/gui.py:693
 msgid "On"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:700
+#: ../tailsgreeter/gui.py:695
 msgid "Off"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:702
-#, python-brace-format
-msgid "{on_or_off} (default)"
-msgstr ""
-
-#: ../tailsgreeter/gui.py:759
-msgid "You would be able to set up an encrypted storage."
-msgstr ""
-
-#: ../tailsgreeter/gui.py:783
+#: ../tailsgreeter/gui.py:769
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:900
+#: ../tailsgreeter/gui.py:886
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:906
+#: ../tailsgreeter/gui.py:892
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:945
+#: ../tailsgreeter/gui.py:931
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""

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

Prev by Author: [tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
Next by Author: [tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
Previous by thread: [tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2
Next by thread: [tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2
Index(es):
- Author
- Thread