[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, 18 Mar 2017 09:19:52 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 18 Mar 2017 05:20:36 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 1052b8cef8071aa9b2fcdeaa7160594938446734
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sat Mar 18 09:19:48 2017 +0000

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

diff --git a/ach/ach.po b/ach/ach.po
index a7196b1..0389312 100644
--- a/ach/ach.po
+++ b/ach/ach.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Acoli (https://www.transifex.com/otf/teams/1519/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ady/ady.po b/ady/ady.po
index 702653b..2ef1b65 100644
--- a/ady/ady.po
+++ b/ady/ady.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Adyghe (https://www.transifex.com/otf/teams/1519/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/af/af.po b/af/af.po
index ee276a2..2c004f3 100644
--- a/af/af.po
+++ b/af/af.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Afrikaans (https://www.transifex.com/otf/teams/1519/af/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ak/ak.po b/ak/ak.po
index b7c93f6..5e2f1b2 100644
--- a/ak/ak.po
+++ b/ak/ak.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Akan (https://www.transifex.com/otf/teams/1519/ak/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/am/am.po b/am/am.po
index 0f790c5..c56a708 100644
--- a/am/am.po
+++ b/am/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Eyob Fitwi <eyob.fitwi@xxxxxxxxx>, 2016\n"
 "Language-Team: Amharic (https://www.transifex.com/otf/teams/1519/am/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "á?á??á?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "á??á??"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ar/ar.po b/ar/ar.po
index 6da7f58..3a5c3ef 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yassmin Alkhatib <yaso95@xxxxxxxxx>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ø§Ù?Ù?ØºÙ?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ø¥Ù?ØºØ§Ø¡"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ø¥Ø¶Ø§Ù?Ø©"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ø±Ø¬Ù?Ø¹"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ø£ØºÙ?Ù? Ø§Ù?Ù?ØªØµÙ?Ø"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/arn/arn.po b/arn/arn.po
index 7375daa..65fd83c 100644
--- a/arn/arn.po
+++ b/arn/arn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Mapudungun (https://www.transifex.com/otf/teams/1519/arn/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ast/ast.po b/ast/ast.po
index d71f890..1ce3f7b 100644
--- a/ast/ast.po
+++ b/ast/ast.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Asturian (https://www.transifex.com/otf/teams/1519/ast/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/az/az.po b/az/az.po
index 49d253d..43a0ddf 100644
--- a/az/az.po
+++ b/az/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/otf/teams/1519/az/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ba/ba.po b/ba/ba.po
index 1b1b790..514fbcd 100644
--- a/ba/ba.po
+++ b/ba/ba.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bashkir (https://www.transifex.com/otf/teams/1519/ba/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/be/be.po b/be/be.po
index 6fb9acd..37fb334 100644
--- a/be/be.po
+++ b/be/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Belarusian (https://www.transifex.com/otf/teams/1519/be/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ð?Ð¾Ð²Ð°"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°Ñ?Ð°Ð²Ð°Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/bg/bg.po b/bg/bg.po
index 5e59bde..a9d4b9f 100644
--- a/bg/bg.po
+++ b/bg/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: alexdimitrov <kvikmen@xxxxxxxxx>, 2016\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/1519/bg/)\n"
@@ -90,7 +90,7 @@ msgstr "Ð?Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° Ð²Ñ?Ð¸Ñ?ÐºÐ¸ MAC Ð°Ð´Ñ?ÐµÑ?Ð¸ (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±
 msgid "Don't spoof MAC addresses"
 msgstr "Ð?Ðµ Ð¿Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð¹ MAC Ð°Ð´Ñ?ÐµÑ?Ð¸Ñ?Ðµ"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÑ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ñ?Ñ?Ñ? Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð°Ñ?Ð° "
@@ -130,24 +130,24 @@ msgid "Save Language & Region Settings"
 msgstr "Ð?Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸Ñ?Ðµ Ð·Ð° ÐµÐ·Ð¸Ðº & Ñ?ÐµÐ³Ð¸Ð¾Ð½"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ð?Ð·Ð¸Ðº"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ð°Ñ?Ð°"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ð¸"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ²Ð° Ð·Ð¾Ð½Ð°"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Ð?Ñ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð¾,Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -161,8 +161,8 @@ msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ð?Ñ?Ð²ÐµÐ´ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð¾Ð»Ð°Ñ?Ð° Ð·Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ"
 
@@ -176,9 +176,9 @@ msgstr ""
 "Ð?Ð°Ñ?ÐµÑ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¾. Ð ÐµÑ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Tails,  Ð·Ð° Ð´Ð° Ð³Ð¾ "
 "Ð·Ð°ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ð¾."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -223,56 +223,72 @@ msgstr ""
 " Ñ?Ñ?Ñ?Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð½Ð°Ñ?Ð¸Ñ?Ð½ÐµÑ?Ðµ \"+\" Ð±Ñ?Ñ?Ð¾Ð½Ñ?Ñ? Ð¿Ð¾-Ð´Ð¾Ð»Ñ?."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Ð?Ð·ÐºÐ» (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ð?ÐºÐ» (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Ð?Ñ?Ñ?Ð·ÐºÐ° Ñ? Ð¼Ñ?ÐµÐ¶Ð°Ñ?Ð°"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð½Ð° (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ð±Ð¸Ñ?Ð°Ð½Ðµ)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Ð?Ð¾Ñ?Ñ? & Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ð?Ð·Ð²Ñ?Ð½ Ð»Ð¸Ð½Ð¸Ñ?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ñ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ð?Ð·ÐºÐ»Ñ?Ñ?Ð²Ð°Ð½Ðµ"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/bn/bn.po b/bn/bn.po
index 9bf66d6..b59ef28 100644
--- a/bn/bn.po
+++ b/bn/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Aftabuzzaman ullah <Leemon432@xxxxxxxxx>, 2016\n"
 "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à¦à¦¾à¦·à¦¾"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦²"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à¦¯à§?à¦?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po
index 7163fc4..6f7b314 100644
--- a/bn_BD/bn_BD.po
+++ b/bn_BD/bn_BD.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bengali (Bangladesh) (https://www.transifex.com/otf/teams/1519/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/bn_IN/bn_IN.po b/bn_IN/bn_IN.po
index 910acdb..036eade 100644
--- a/bn_IN/bn_IN.po
+++ b/bn_IN/bn_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Bengali (India) (https://www.transifex.com/otf/teams/1519/bn_IN/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/bo/bo.po b/bo/bo.po
index 5384eeb..68181f7 100644
--- a/bo/bo.po
+++ b/bo/bo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Tibetan (https://www.transifex.com/otf/teams/1519/bo/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/br/br.po b/br/br.po
index 0346bb4..b79e83e 100644
--- a/br/br.po
+++ b/br/br.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Breton (https://www.transifex.com/otf/teams/1519/br/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "NullaÃ±"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/brx/brx.po b/brx/brx.po
index 91fe222..f461eb6 100644
--- a/brx/brx.po
+++ b/brx/brx.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Bodo (https://www.transifex.com/otf/teams/1519/brx/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/bs/bs.po b/bs/bs.po
index cb28074..991ffaa 100644
--- a/bs/bs.po
+++ b/bs/bs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Bosnian (https://www.transifex.com/otf/teams/1519/bs/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Nazad"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ca/ca.po b/ca/ca.po
index 195f7c7..15cc5be 100644
--- a/ca/ca.po
+++ b/ca/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: icc <mail@xxxxxxxxxx>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
@@ -91,7 +91,7 @@ msgstr "Falsejament de totes les direccions MAC (per defecte)"
 msgid "Don't spoof MAC addresses"
 msgstr "No falsejar les direccions MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "No es pot desbloquejar la memÃ²ria encriptada amb la contrasenya."
 
@@ -129,24 +129,24 @@ msgid "Save Language & Region Settings"
 msgstr "Desar parÃ metres de llengua i regiÃ³"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Llengua"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "DisposiciÃ³ del teclat"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formats"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Zona horÃ ria"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Emmagatzematge persistent encriptat"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -160,8 +160,8 @@ msgstr "ParÃ metres d'emmagatzemament persistent"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Entrar contrasenya per desbloquejar l'emmagatzemament persistent"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Desbloquejar"
 
@@ -173,9 +173,9 @@ msgstr "Re-bloquejar l'emmagatzemament persistent"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ParÃ metres adicionals"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -220,56 +220,72 @@ msgstr ""
 "una configuraciÃ³ personalitzada, pressionar el botÃ³ \"+\"."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "DesactivaciÃ³ (defecte)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "ActivaciÃ³ (defecte)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "ConnexiÃ³ de xarxa"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Directe (defecte)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Pont i servidor intermedi"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Fora de lÃnia"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Error al blocar l'emmagatzemament persistent."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Desbloquejar"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ParÃ metres adicionals"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Afegeix"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Enrera"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Tancar"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Executar Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/ceb/ceb.po b/ceb/ceb.po
index fbdc560..d841e84 100644
--- a/ceb/ceb.po
+++ b/ceb/ceb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Cebuano (https://www.transifex.com/otf/teams/1519/ceb/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/cs/cs.po b/cs/cs.po
index ee3b237..117b8fd 100644
--- a/cs/cs.po
+++ b/cs/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adam Slovacek <adamslovacek@xxxxxxxxx>, 2016\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jazyk"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "PÅ?idat"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "ZpÄ?t"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/csb/csb.po b/csb/csb.po
index 85a0ffc..9b2c380 100644
--- a/csb/csb.po
+++ b/csb/csb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Kashubian (https://www.transifex.com/otf/teams/1519/csb/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/cv/cv.po b/cv/cv.po
index 42973eb..0dbb1d9 100644
--- a/cv/cv.po
+++ b/cv/cv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ð¥Ä?Ð¹Ñ?Ð¸ÐºÐºÐ¸ <rastamaf@xxxxxxxxx>, 2016\n"
 "Language-Team: Chuvash (https://www.transifex.com/otf/teams/1519/cv/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ñ?Ã¿Ð½Ñ?ÐµÑ?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/cy/cy.po b/cy/cy.po
index 717c2ae..6dd36d2 100644
--- a/cy/cy.po
+++ b/cy/cy.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
+"Last-Translator: Huw Waters <huwwaters@xxxxxxxxx>, 2016\n"
 "Language-Team: Welsh (https://www.transifex.com/otf/teams/1519/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Iaith"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/da/da.po b/da/da.po
index 1faa4df..4d92696 100644
--- a/da/da.po
+++ b/da/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Caspar Christensen <klovnedukke@xxxxxxxxx>, 2016\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)\n"
@@ -91,7 +91,7 @@ msgstr "Spoof alle MAC-adresser (standard)"
 msgid "Don't spoof MAC addresses"
 msgstr "Spoof ikke MAC-adresser"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Kan ikke lÃ¥se krypteret lager op med denne adgangsfrase."
 
@@ -129,24 +129,24 @@ msgid "Save Language & Region Settings"
 msgstr "Gem sprog- og regionsindstillinger"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Sprog"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Tastaturlayout"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formater"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Tidszone"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Krypteret vedvarende lager"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -160,8 +160,8 @@ msgstr "Konfigurer vedvarende lager"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Indtast din adgangsfrase for at lÃ¥se det vedvarende lager op"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "LÃ¥s op"
 
@@ -173,9 +173,9 @@ msgstr "LÃ¥s vedvarende lager igen"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Dit vedvarende lager er lÃ¥st op. Genstart Tails for at lÃ¥se det igen."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Yderligere indstillinger"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -220,56 +220,72 @@ msgstr ""
 "\"+\"-knappen nedenfor, for at tilfÃ¸je en tilpasset indstilling."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Fra (standard)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Til (standard)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "NetvÃ¦rksforbindelse"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direkte (standard)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bro og proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Kunne ikke genlÃ¥s vedvarende lagring."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "LÃ¥ser opâ?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Yderligere indstillinger"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Annuller"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "TilfÃ¸j"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Tilbage"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Luk ned"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/de/de.po b/de/de.po
index 1415a07..a58b8af 100644
--- a/de/de.po
+++ b/de/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: max weber <hfr@xxxxxxxxx>, 2017\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
@@ -91,7 +91,7 @@ msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
 msgid "Don't spoof MAC addresses"
 msgstr "MAC-Adressen nicht manipulieren"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "VerschlÃ¼sselter Speicher kann mit dieser Passphrase nicht entsperrt werden."
@@ -130,24 +130,24 @@ msgid "Save Language & Region Settings"
 msgstr "Sprache & Regionseinstellungen speichern"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Sprache"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Tastaturbelegung"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formate"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Zeitzone"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "VerschlÃ¼sselte bestÃ¤ndige Datenpartition"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -163,8 +163,8 @@ msgstr ""
 "Geben Sie Ihre Passphrase ein, um die bestÃ¤ndige Datenpartition zu "
 "entsperren"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Entsperren"
 
@@ -178,9 +178,9 @@ msgstr ""
 "Ihre bestÃ¤ndige Datenpartition ist entsperrt. Starten Sie Tails neu, um sie "
 "wieder zu sperren."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ZusÃ¤tzliche Einstellungen"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -229,56 +229,72 @@ msgstr ""
 "SchaltflÃ¤che Â»+Â«."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Aus (Vorgabe)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ein (Vorgabe)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Netzwerkverbindung"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direkt (Vorgabe)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "BrÃ¼cke & Vermittlungsserver"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "BestÃ¤ndige Datenpartition konnte nicht wieder gesperrt werden."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Wird entsperrt â?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ZusÃ¤tzliche Einstellungen"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "ZurÃ¼ck"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Herunterfahren"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Tails starten"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/dz/dz.po b/dz/dz.po
index cd6bb1c..41f36ab 100644
--- a/dz/dz.po
+++ b/dz/dz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Dzongkha (https://www.transifex.com/otf/teams/1519/dz/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/el/el.po b/el/el.po
index b356c91..2c5e425 100644
--- a/el/el.po
+++ b/el/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Adrian Pappas <pappasadrian@xxxxxxxxx>, 2017\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n"
@@ -91,7 +91,7 @@ msgstr "Î?Î»Î»Î¿Î¯Ï?Ï?Î· Ï?Î»Ï?Î½ Ï?Ï?Î½ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÏ?Î½ MAC (Ï?Ï?Î¿ÎµÏ?
 msgid "Don't spoof MAC addresses"
 msgstr "Î?Î± Î¼Î·Î½ Î±Î»Î»Î¿Î¹Ï?Î½Î¿Î½Ï?Î±Î¹ Î¿Î¹ Î´Î¹ÎµÏ?Î¸Ï?Î½Ï?ÎµÎ¹Ï? MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "Î?ÎµÎ½ Î¼Ï?Î¿Ï?Î¿Ï?Î¼Îµ Î½Î± Î¾ÎµÎºÎ»ÎµÎ¹Î´Ï?Ï?Î¿Ï?Î¼Îµ Ï?Î¿Î½ ÎºÏ?Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î·Î¼ÎÎ½Î¿ Î±Ï?Î¿Î¸Î·ÎºÎµÏ?Ï?Î¹ÎºÏ? Ï?Ï?Ï?Î¿ Î¼Îµ Î±Ï?Ï?Î® "
@@ -127,24 +127,24 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Î?Î»Ï?Ï?Ï?Î±"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Î¤Î¿Ï?Î¿Î»Î¿Î³Î¯Î± Ï?Î»Î·ÎºÏ?Ï?Î¿Î»Î¿Î³Î¯Î¿Ï?"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Î?Ï?Î½Î· Î?Ï?Î±Ï?"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Î?Ï?Î½Î¹Î¼Î¿Ï? ÎºÏ?Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î·Î¼ÎÎ½Î¿Ï? Ï?Ï?Ï?Î¿Ï? Î±Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î·Ï?"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -158,8 +158,8 @@ msgstr "Î¡Ï?Î¸Î¼Î¹Ï?Î· Î¼Ï?Î½Î¹Î¼Î¿Ï? Ï?Ï?Ï?Î¿Ï? Î±Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î·Ï?"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Î?ÎµÎºÎ»ÎµÎ¯Î´Ï?Î¼Î±"
 
@@ -171,9 +171,9 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Î?Ï?Î¹Ï?Î»ÎÎ¿Î½ Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï?"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -213,55 +213,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Î?Î»ÎµÎ¹Ï?Ï?Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î®)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Î?Î½Î¿Î¹Ï?Ï?Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î®)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Î?Ï?ÎµÏ?Î¸ÎµÎ¯Î±Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î®)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Î?ÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Î?ÎµÎºÎ»ÎµÎ¹Î´Ï?Î½ÎµÏ?Î±Î¹..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Î?Ï?Î¹Ï?Î»ÎÎ¿Î½ Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï?"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Î?ÎºÏ?Ï?Ï?Ï?Î·"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Î Ï?Î¿Ï?Î¸Î®ÎºÎ·"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Î Î¯Ï?Ï?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Î?Î»ÎµÎ¯Ï?Î¹Î¼Î¿"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po
index 4865878..31a9713 100644
--- a/en_GB/en_GB.po
+++ b/en_GB/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: newharha ehrara <dbybgohg@xxxxxxxxxxx>, 2016\n"
 "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Language"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Add"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/eo/eo.po b/eo/eo.po
index a97bc3c..9e59959 100644
--- a/eo/eo.po
+++ b/eo/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Arturo Crespo <arthurocrates@xxxxxxxxxxx>, 2017\n"
 "Language-Team: Esperanto (https://www.transifex.com/otf/teams/1519/eo/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Lingvo"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Rezigni"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Aldoni"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "MalantaÅe"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/es/es.po b/es/es.po
index 673cbe3..887016a 100644
--- a/es/es.po
+++ b/es/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emma Peel <emmapeel@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -92,7 +92,7 @@ msgstr "Falsificar todas las direcciones MAC (predeterminado)"
 msgid "Don't spoof MAC addresses"
 msgstr "No falsificar las direcciones MAC "
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "No se puede desbloquear el almacenamiento cifrado con esta contraseÃ±a."
@@ -130,24 +130,24 @@ msgid "Save Language & Region Settings"
 msgstr "Guardar la configuraciÃ³n regional y de idioma"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Idioma"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "ConfiguraciÃ³n del teclado"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formatos "
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Zona horaria "
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Almacenamiento cifrado permanente"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -162,8 +162,8 @@ msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Introduzca su contraseÃ±a para desbloquear el almacenamiento permanente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Desbloquear "
 
@@ -177,9 +177,9 @@ msgstr ""
 "Su almacenamiento persistente estÃ¡ desbloqueado. Reinicie Tails para "
 "bloquearlo de nuevo."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Configuraciones adicionales "
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -226,56 +226,72 @@ msgstr ""
 "una configuraciÃ³n personalizada, pulsa el botÃ³n \"+\"."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Desactivada (predeterminado) "
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Activada (predeterminado) "
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "ConexiÃ³n a la red "
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Directa (predeterminado) "
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Puente y proxy "
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "No se pudo volver a bloquear el almacenamiento permanente."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Desbloqueando... "
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Configuraciones adicionales "
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar "
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "AÃ±adir "
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "AtrÃ¡s "
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Cerrar "
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Iniciar Tails "
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index a2cd8eb..be5e09c 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: ezemelano <melanoeze@xxxxxxxxx>, 2016\n"
+"Last-Translator: Pablo Di Noto <pdinoto@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Idioma"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Agrefgar"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "AtrÃ¡s"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/es_CL/es_CL.po b/es_CL/es_CL.po
index 9fa41a4..55527f3 100644
--- a/es_CL/es_CL.po
+++ b/es_CL/es_CL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Francisco Eduardo Espinoza Castro <francisco.fespinoza@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Chile) (https://www.transifex.com/otf/teams/1519/es_CL/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/es_CO/es_CO.po b/es_CO/es_CO.po
index b4abef6..8b9f257 100644
--- a/es_CO/es_CO.po
+++ b/es_CO/es_CO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: William BeltrÃ¡n <wbeltranc@xxxxxxxxx>, 2016\n"
 "Language-Team: Spanish (Colombia) (https://www.transifex.com/otf/teams/1519/es_CO/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/es_MX/es_MX.po b/es_MX/es_MX.po
index 041c14d..d8a3b9e 100644
--- a/es_MX/es_MX.po
+++ b/es_MX/es_MX.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sanxcher Motala <motala.sanxcher@xxxxxxxxxx>, 2017\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/otf/teams/1519/es_MX/)\n"
@@ -92,7 +92,7 @@ msgstr "Spoofear todas las direcciones Mac (por defaulto) "
 msgid "Don't spoof MAC addresses"
 msgstr "No falsificar direcciones MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -128,24 +128,24 @@ msgid "Save Language & Region Settings"
 msgstr "Guardar ConfiguraciÃ³n de Lenguaje y Region"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Lenguaje"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "DistribuciÃ³n de Teclado"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formatos"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Zona horaria"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Almacenamiento Codificado Persistente"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -159,8 +159,8 @@ msgstr "Configurar Almacenamiento Persistente"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Introduce tu fraseclave para abrir el almacenamiento persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Abrir"
 
@@ -172,9 +172,9 @@ msgstr "Cerrar Almacenamiento Persistente"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Configuracion adicional"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -214,55 +214,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Configuracion adicional"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/et/et.po b/et/et.po
index cc5cdc6..a540207 100644
--- a/et/et.po
+++ b/et/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: G <purexxxx@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Estonian (https://www.transifex.com/otf/teams/1519/et/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Lisa"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/eu/eu.po b/eu/eu.po
index 7720ad5..b586fd2 100644
--- a/eu/eu.po
+++ b/eu/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Iban <iban.ferreira@xxxxxxxxx>, 2016\n"
 "Language-Team: Basque (https://www.transifex.com/otf/teams/1519/eu/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Hizkuntza"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Lineaz kanpo"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Gehitu"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Atzera"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Itzali"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/fa/fa.po b/fa/fa.po
index 7f43958..0a0d5c8 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: aidin <aidin.eslami@xxxxxxxxx>, 2016\n"
+"Last-Translator: NoProfile <mini.subject@xxxxxxxxx>, 2016\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr "Ø¬Ø¹Ù? Ù?Ù?Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? MAC (Ù¾Û?Ø´ Ù?Ø±Ø¶)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ø¬Ø¹Ù? Ù?Ú©Ø±Ø¯Ù? MAC Ø¢Ø¯Ø±Ø³ Ù?Ø§"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,24 +116,24 @@ msgid "Save Language & Region Settings"
 msgstr "Ø°Ø®Û?Ø±Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø²Ø¨Ø§Ù? Ù? Ù?Ù?Ø·Ù?Ù?"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ø²Ø¨Ø§Ù?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Ø·Ø±Ø Ø¨Ù?Ø¯Û? ØµÙ?ØÙ? Ú©Ù?Û?Ø¯"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Ù?Ø±Ù?Øª Ù?Ø§"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Ù?Ù?Ø·Ù?Ù? Ø²Ù?Ø§Ù?Û?"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Ø°Ø®Û?Ø±Ù? Ø¯Ø§Ø¦Ù?Û? Ø±Ù?Ø²Ú¯Ø°Ø§Ø±Û? Ø´Ø¯Ù?"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -147,8 +147,8 @@ msgstr "Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ø°Ø®Û?Ø±Ù? Ø¯Ø§Ø¦Ù?Û?"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù?Ù?Ù?"
 
@@ -160,9 +160,9 @@ msgstr "Ù?Ù?Ù? Ù?Ø¬Ø¯Ø¯ Ø°Ø®Û?Ø±Ù? Ø¯Ø§Ø¦Ù?Û?"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ø¶Ø§Ù?Û?"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -202,56 +202,72 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Ø®Ø§Ù?Ù?Ø´ (Ù¾Û?Ø´ Ù?Ø±Ø¶)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ø±Ù?Ø´Ù? (Ù¾Û?Ø´ Ù?Ø±Ø¶)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Ø§ØªØµØ§Ù? Ø´Ø¨Ú©Ù?"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Ù?Ø³ØªÙ?Û?Ù? (Ù¾Û?Ø´ Ù?Ø±Ø¶)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Ù¾Ù? Ù? Ù¾Ø±Ù?Ú©Ø³Û?"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ø¢Ù?Ù?Ø§Û?Ù?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Ø¨Ø§Ø² Ú©Ø±Ø¯Ù? Ù?Ù?Ù? ..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ø¶Ø§Ù?Û?"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ù?ØºÙ?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ø§Ù?Ø²Ù?Ø¯Ù?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Back"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ø®Ø§Ù?Ù?Ø´ Ú©Ø±Ø¯Ù?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Ø´Ø±Ù?Ø¹ ØªÛ?Ù?Ø²"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/fi/fi.po b/fi/fi.po
index daca018..66024a8 100644
--- a/fi/fi.po
+++ b/fi/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jaakko Helleranta <jaakko@xxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Finnish (https://www.transifex.com/otf/teams/1519/fi/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Kieli"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Poissa verkosta"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "LisÃ¤Ã¤"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Takaisin"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Sammuta"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/fil/fil.po b/fil/fil.po
index 60e666d..710d58d 100644
--- a/fil/fil.po
+++ b/fil/fil.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jed Aureus Gonzales (AU Gonzales) <gonzales.au@xxxxxxxxx>, 2016\n"
 "Language-Team: Filipino (https://www.transifex.com/otf/teams/1519/fil/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "I-kansela"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Idagdag"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Balik"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/fo/fo.po b/fo/fo.po
index c1a02ce..d540159 100644
--- a/fo/fo.po
+++ b/fo/fo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sigmund JÃ¸rgensen <sigmund@xxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Angra"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Legg afturat"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "SlÃ¸kk"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/fr/fr.po b/fr/fr.po
index b31a97e..8f749de 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mortimer <doug.mortimer@xxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
@@ -92,7 +92,7 @@ msgstr "DÃ©guiser toutes les adresses MAC (par dÃ©faut)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ne pas dÃ©guiser les adresses MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "Cette phrase de passe ne permet pas de dÃ©verrouiller le stockage chiffrÃ©."
@@ -131,24 +131,24 @@ msgid "Save Language & Region Settings"
 msgstr "Enregistrer les paramÃ¨tres de langue et de rÃ©gion"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Langue"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Disposition du clavier"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formats"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Fuseau horaire"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Stockage persistant chiffrÃ©"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -163,8 +163,8 @@ msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Saisir votre phrase de passe pour dÃ©verrouiller le stockage persistant"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "DÃ©verrouiller"
 
@@ -178,9 +178,9 @@ msgstr ""
 "Votre stockage persistant est dÃ©verrouillÃ©. RedÃ©marrer Tails pour le "
 "reverrouiller."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ParamÃ¨tres supplÃ©mentaires"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -225,56 +225,72 @@ msgstr ""
 " paramÃ¨tre personnalisÃ©, appuyer sur le bouton Â« + Â» ci-dessous."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "DÃ©sactivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "ActivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Connexion rÃ©seau"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Directe (par dÃ©faut)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Pont et mandataire"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Ã?chec de reverrouillage du stockage persistant."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "DÃ©verrouillage..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ParamÃ¨tres supplÃ©mentaires"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Retour"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Extinction"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "DÃ©marrer Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po
index a7e7cee..32ef61c 100644
--- a/fr_CA/fr_CA.po
+++ b/fr_CA/fr_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: French language coordinator <french.translation@xxxxxxx>, 2016\n"
 "Language-Team: French (Canada) (https://www.transifex.com/otf/teams/1519/fr_CA/)\n"
@@ -92,7 +92,7 @@ msgstr "DÃ©guiser toutes les adresses MAC (par dÃ©faut)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ne pas dÃ©guiser les adresses MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "Cette phrase de passe ne permet pas de dÃ©verrouiller le stockage chiffrÃ©."
@@ -131,24 +131,24 @@ msgid "Save Language & Region Settings"
 msgstr "Enregistrer les paramÃ¨tres de langue et de rÃ©gion"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Langue"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Disposition du clavier"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formats"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Fuseau horaire"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Stockage persistant chiffrÃ©"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -163,8 +163,8 @@ msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 "Saisir votre phrase de passe pour dÃ©verrouiller le stockage persistant"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "DÃ©verrouiller"
 
@@ -178,9 +178,9 @@ msgstr ""
 "Votre stockage persistant est dÃ©verrouillÃ©. RedÃ©marrer Tails pour le "
 "reverrouiller."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ParamÃ¨tres supplÃ©mentaires"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -225,56 +225,72 @@ msgstr ""
 "ajouter un paramÃ¨tre personnalisÃ©, peser sur le bouton Â« + Â» ci-dessous."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "DÃ©sactivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "ActivÃ© (par dÃ©faut)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Connexion rÃ©seau"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Directe (par dÃ©faut)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bon et mandataire"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Ã?chec de reverrouillage du stockage persistant."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "DÃ©verrouillage..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ParamÃ¨tres supplÃ©mentaires"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Retour"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Extinction"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "DÃ©marrer Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/fur/fur.po b/fur/fur.po
index da7c4f8..5d78f73 100644
--- a/fur/fur.po
+++ b/fur/fur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Friulian (https://www.transifex.com/otf/teams/1519/fur/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/fy/fy.po b/fy/fy.po
index 347d045..4fbe1c6 100644
--- a/fy/fy.po
+++ b/fy/fy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robin van der Vliet <info@xxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Western Frisian (https://www.transifex.com/otf/teams/1519/fy/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Taal"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Annulearje"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ofslute"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ga/ga.po b/ga/ga.po
index 4fa5fb7..cf51943 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cur ar Ceal"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/gd/gd.po b/gd/gd.po
index 23f0040..438fd2a 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Gaelic, Scottish (https://www.transifex.com/otf/teams/1519/gd/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/gl/gl.po b/gl/gl.po
index 4558453..9f0bcde 100644
--- a/gl/gl.po
+++ b/gl/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Xan VFR <formularios@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Galician (https://www.transifex.com/otf/teams/1519/gl/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Idioma"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Engadir"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "AtrÃ¡s"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/gu/gu.po b/gu/gu.po
index 890677c..0075442 100644
--- a/gu/gu.po
+++ b/gu/gu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "àª°àª¦à«? àª?àª°à«?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "àª¬àª?àª§ àª?àª°à«?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/gu_IN/gu_IN.po b/gu_IN/gu_IN.po
index 606fae1..7a6ec3b 100644
--- a/gu_IN/gu_IN.po
+++ b/gu_IN/gu_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sukhbir Singh <sukhbir.in@xxxxxxxxx>, 2016\n"
 "Language-Team: Gujarati (India) (https://www.transifex.com/otf/teams/1519/gu_IN/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "àª°àª¦ àª?àª°à«?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/gun/gun.po b/gun/gun.po
index 90aed2f..18d7449 100644
--- a/gun/gun.po
+++ b/gun/gun.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Gun (https://www.transifex.com/otf/teams/1519/gun/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ha/ha.po b/ha/ha.po
index 610d403..987ecca 100644
--- a/ha/ha.po
+++ b/ha/ha.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Hausa (https://www.transifex.com/otf/teams/1519/ha/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/he/he.po b/he/he.po
index 1ce8f33..52fdac5 100644
--- a/he/he.po
+++ b/he/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: GenghisKhan <genghiskhan@xxxxxx>, 2016\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "×©×¤×?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "×?×? ×?×§×?×?×?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "×?×?×?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "×?×?×¡×£"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "×?×§×?×?×?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "×?×?×?×?×?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/hi/hi.po b/hi/hi.po
index 188a332..607e190 100644
--- a/hi/hi.po
+++ b/hi/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Meghana S <meghana.cse11@xxxxxxxxx>, 2016\n"
 "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à¤à¤¾à¤·à¤¾"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¥?à¤?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à¤¡à¤¾à¤²à¥?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "à¤µà¤¾à¤ªà¤¸"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/hr/hr.po b/hr/hr.po
index a3f7644..309b20f 100644
--- a/hr/hr.po
+++ b/hr/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jezik"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index c341971..02fd628 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ana B <abuljan031@xxxxxxxxx>, 2016\n"
 "Language-Team: Croatian (Croatia) (https://www.transifex.com/otf/teams/1519/hr_HR/)\n"
@@ -91,7 +91,7 @@ msgstr "Maskiraj sve MAC adrese (zadano)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ne maskiraj MAC adrese"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ne mogu otkljuÄ?ati enkriptiranu pohranu s ovom lozinkom."
 
@@ -128,24 +128,24 @@ msgid "Save Language & Region Settings"
 msgstr "Spremite postavke jezika i regije"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jezik"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Postavke tipkovnice"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formati"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Vremenska zona"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Enkriptirana trajna pohrana"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -159,8 +159,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "OtkljuÄ?aj"
 
@@ -174,9 +174,9 @@ msgstr ""
 "VaÅ¡a trajna pohrana je otkljuÄ?ana. Ponovno pokrenite Tails kako bi ju opet "
 "zakljuÄ?ali."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Dodatne postavke"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -221,56 +221,72 @@ msgstr ""
 "postavke, stisnite \"+\" gumb."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "IskljuÄ?eno (zadano)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "UkljuÄ?eno (zadano)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "MreÅ¾na veza"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direktno (zadano)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Most i proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Nije uspjelo zakljuÄ?avanje trajne pohrane."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "OtkljuÄ?avam..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Dodatne postavke"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Povratak"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "GaÅ¡enje"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Pokreni Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/ht/ht.po b/ht/ht.po
index e302b0c..e02a6e0 100644
--- a/ht/ht.po
+++ b/ht/ht.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Haitian (Haitian Creole) (https://www.transifex.com/otf/teams/1519/ht/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/hu/hu.po b/hu/hu.po
index cd6c54a..bfdc0bf 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>, 2016\n"
+"Last-Translator: benewfy <benewfy@xxxxxxxxx>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Nyelv"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "MÃ©gsem"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "HozzÃ¡ad"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Vissza"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "LeÃ¡llÃtÃ¡s"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/hy/hy.po b/hy/hy.po
index 0eebba6..ca4f102 100644
--- a/hy/hy.po
+++ b/hy/hy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Armenian (https://www.transifex.com/otf/teams/1519/hy/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ia/ia.po b/ia/ia.po
index 11f8340..adfd774 100644
--- a/ia/ia.po
+++ b/ia/ia.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Funkin <emisepulvedam@xxxxxxxxx>, 2016\n"
 "Language-Team: Interlingua (https://www.transifex.com/otf/teams/1519/ia/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Linguage"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Foras de linea"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Retro"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/id/id.po b/id/id.po
index 61e1ac0..0e98e82 100644
--- a/id/id.po
+++ b/id/id.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: hpiece 8 <hpiece8@xxxxxxxxx>, 2017\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Bahasa"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Luring"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Tambah"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Kembali"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Matikan"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/is/is.po b/is/is.po
index 84d6033..8a82f0c 100644
--- a/is/is.po
+++ b/is/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sveinn Ã Felli <sv1@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
@@ -91,7 +91,7 @@ msgstr "DulbÃºa Ã¶ll MAC-vistfÃ¶ng (sjÃ¡lfgefiÃ°)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ekki dulbÃºa MAC-vistfÃ¶ng"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Get ekki aflÃ¦st dulritaÃ°ri gagnageymslu meÃ° Ã¾essum lykilfrasa."
 
@@ -129,24 +129,24 @@ msgid "Save Language & Region Settings"
 msgstr "Vista tungumÃ¡la- og svÃ¦Ã°isstillingar"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "TungumÃ¡l"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "LyklaborÃ°suppsetning"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "SniÃ°"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "TÃmabelti"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "DulrituÃ° varanleg gagnageymsla"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -160,8 +160,8 @@ msgstr "Stilla varanlega gagnageymslu"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Settu inn lykilfrasann til aÃ° aflÃ¦sa varanlegu gagnageymslunni"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "AflÃ¦sa"
 
@@ -175,9 +175,9 @@ msgstr ""
 "Varanlega gagnageymslan Ã¾Ãn er Ã³lÃ¦st. EndurrÃ¦stu Tails til aÃ° lÃ¦sa henni "
 "aftur."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Aukastillingar"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -222,56 +222,72 @@ msgstr ""
 " sÃ©rsniÃ°num stillingum, Ã½ttu Ã¡ \"+\" hnappinn hÃ©r fyrir neÃ°an."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "SlÃ¶kkt (sjÃ¡lfgefiÃ°)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Kveikt (sjÃ¡lfgefiÃ°)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Netkerfistenging"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Beint (sjÃ¡lfgefiÃ°)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "BrÃº og milliÃ¾jÃ³nn"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ã?nettengt"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "TÃ³kst ekki aÃ° lÃ¦sa aftur varanlegri gagnageymslu."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "AflÃ¦siâ?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Aukastillingar"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "HÃ¦tta viÃ°"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "BÃ¦ta viÃ°"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Til baka"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "SlÃ¶kkva"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "RÃ¦sa Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/it/it.po b/it/it.po
index 001adbb..1edbcaf 100644
--- a/it/it.po
+++ b/it/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Random_R <rand@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"
@@ -92,7 +92,7 @@ msgstr "Spoof di tutti gli indirizzi MAC (predefinito)"
 msgid "Don't spoof MAC addresses"
 msgstr "Nessuno spoof degli indirizzi MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Impossibile sbloccare il volume cifrato con questa password."
 
@@ -130,24 +130,24 @@ msgid "Save Language & Region Settings"
 msgstr "Save Language & Region Settings"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Lingua"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Disposizione tastiera"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formati"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Fuso orario"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Volume persistente cifrato"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -161,8 +161,8 @@ msgstr "Configura volume persistente"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Inserisci la tua password per sbloccare il volume persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Sblocca"
 
@@ -174,9 +174,9 @@ msgstr "Riblocca volume persistente"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Il tuo volume persistente Ã¨ sbloccato. Riavvia Tails per ribloccarlo."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Impostazioni aggiuntive"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -221,56 +221,72 @@ msgstr ""
 "aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Off (predefinito)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "On (predefinito)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Connessione di rete"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Diretta (predefinito)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bridge e Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Non in linea"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Impossibile ribloccare il volume persistente."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Sblocco..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Impostazioni aggiuntive"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancella"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Indietro"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Chiusura"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Avvia Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/ja/ja.po b/ja/ja.po
index 3f7d80a..5431aac 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Hussein Hassan <hehewawa1@xxxxxxxxx>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
@@ -82,7 +82,7 @@ msgstr "å?¨ã?¦ã?®MACã?¢ã??ã?¬ã?¹ã??è©?ç§°ã??ã??(å??æ??è¨å®?å?¤)"
 msgid "Don't spoof MAC addresses"
 msgstr "MACã?¢ã??ã?¬ã?¹ã??è©?ç§°ã??ã?ªã??"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "è¨?èª?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "ã?ªã??ã?©ã?¤ã?³"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ã?ã?£ã?³ã?»ã?«"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "è¿½å? "
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "æ?»ã??"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "å??æ¢"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/jv/jv.po b/jv/jv.po
index fb16e9b..fe2f6fa 100644
--- a/jv/jv.po
+++ b/jv/jv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Javanese (https://www.transifex.com/otf/teams/1519/jv/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ka/ka.po b/ka/ka.po
index 5652fcd..0c3268a 100644
--- a/ka/ka.po
+++ b/ka/ka.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "á??á??á??"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "á??á??á?¡á?£á??á?? á?¥á?¡á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "á??á??á?£á?¥á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "á??á??á??á??á?¢á??á??á??"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/kk/kk.po b/kk/kk.po
index 49cd11a..7e37873 100644
--- a/kk/kk.po
+++ b/kk/kk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Kazakh (https://www.transifex.com/otf/teams/1519/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/km/km.po b/km/km.po
index 92dc41a..0fa755f 100644
--- a/km/km.po
+++ b/km/km.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Sokhem Khoem <sokhem@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Khmer (https://www.transifex.com/otf/teams/1519/km/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "á??á?¶á??á?¶"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "á??á??á??á??á??á??"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "á??á?·á??"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/kn/kn.po b/kn/kn.po
index 7aa0fec..970e26e 100644
--- a/kn/kn.po
+++ b/kn/kn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: MSJ <mallikarjunasj@xxxxxxxxx>, 2016\n"
 "Language-Team: Kannada (https://www.transifex.com/otf/teams/1519/kn/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à²à²¾à²·à³?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ko/ko.po b/ko/ko.po
index 9c178b2..d2d6030 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yongmin Hong <revi@xxxxxxxxx>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n"
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -117,23 +117,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "ì?¸ì?´"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -148,8 +148,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -161,8 +161,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -203,55 +203,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "ì?¤í??ë?¼ì?¸"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ì·¨ì??"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "ì¶?ê°?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "ë?¤ë¡?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "ì¢?ë£?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po
index 07fd3b5..2f7e585 100644
--- a/ko_KR/ko_KR.po
+++ b/ko_KR/ko_KR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dr.what <javrick6@xxxxxxxxx>, 2016\n"
 "Language-Team: Korean (Korea) (https://www.transifex.com/otf/teams/1519/ko_KR/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "ì?¸ì?´"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "ì?¤í??ë?¼ì?¸"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ì·¨ì??"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "ë?¤ë¡?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "ì¢?ë£?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ku/ku.po b/ku/ku.po
index 1146def..20e8310 100644
--- a/ku/ku.po
+++ b/ku/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Kurdish (https://www.transifex.com/otf/teams/1519/ku/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ku_IQ/ku_IQ.po b/ku_IQ/ku_IQ.po
index d552961..de28380 100644
--- a/ku_IQ/ku_IQ.po
+++ b/ku_IQ/ku_IQ.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Rasti K5 <rasti.khdhr@xxxxxxxxx>, 2016\n"
 "Language-Team: Kurdish (Iraq) (https://www.transifex.com/otf/teams/1519/ku_IQ/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ø²Ù?Ø§Ù?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ø¯Û?Ø±Ù?Û?Úµ"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ù?Û?ÚµÙ?Û?Ø´Ø§Ù?Ø¯Ù?Û?Ù?Û?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ø²Û?Ø§Ø¯Ú©Ø±Ø¯Ù?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/kw/kw.po b/kw/kw.po
index 93e7a34..9eebcb3 100644
--- a/kw/kw.po
+++ b/kw/kw.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Cornish (https://www.transifex.com/otf/teams/1519/kw/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ky/ky.po b/ky/ky.po
index 36d6052..fc91bbc 100644
--- a/ky/ky.po
+++ b/ky/ky.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Kyrgyz (https://www.transifex.com/otf/teams/1519/ky/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð?Ð¹Ð½Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/la/la.po b/la/la.po
index 54f3197..7305003 100644
--- a/la/la.po
+++ b/la/la.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alisa P <parashchenko.alisa@xxxxxxxxxx>, 2016\n"
 "Language-Team: Latin (https://www.transifex.com/otf/teams/1519/la/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Lingua"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Claudere"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/lb/lb.po b/lb/lb.po
index 92b9d3e..53fa309 100644
--- a/lb/lb.po
+++ b/lb/lb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Luxembourgish (https://www.transifex.com/otf/teams/1519/lb/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Sprooch"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "BÃ¤ifÃ¼gen"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/lg/lg.po b/lg/lg.po
index 06e2713..66220eb 100644
--- a/lg/lg.po
+++ b/lg/lg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Ganda (https://www.transifex.com/otf/teams/1519/lg/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ln/ln.po b/ln/ln.po
index 51f2655..c2f0a7e 100644
--- a/ln/ln.po
+++ b/ln/ln.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Lingala (https://www.transifex.com/otf/teams/1519/ln/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/lo/lo.po b/lo/lo.po
index 6a6e6f6..d6270dd 100644
--- a/lo/lo.po
+++ b/lo/lo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Lao (https://www.transifex.com/otf/teams/1519/lo/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "àº?àº»àº?à»?àº¥àºµàº?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/lt/lt.po b/lt/lt.po
index c084bbb..f633dd6 100644
--- a/lt/lt.po
+++ b/lt/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Gediminas Golcevas <>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/otf/teams/1519/lt/)\n"
@@ -91,7 +91,7 @@ msgstr "Klastoti visus MAC adresus (numatytasis)"
 msgid "Don't spoof MAC addresses"
 msgstr "Neklastoti MAC adresus"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
 
@@ -127,24 +127,24 @@ msgid "Save Language & Region Settings"
 msgstr "Ä®raÅ¡yti kalbos ir regiono nustatymus"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Kalba"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "KlaviatÅ«ros iÅ¡dÄ?stymas"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formatai"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Laiko juosta"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Å ifruotas ilgalaikis kaupiklis"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -158,8 +158,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Atrakinti"
 
@@ -171,9 +171,9 @@ msgstr "IÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Papildomi nustatymai"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -220,56 +220,72 @@ msgstr ""
 "pasirinktinÄ¯ nustatymÄ?, Å¾emiau spustelÄ?kite mygtukÄ? \"+\"."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "IÅ¡jungta (numatytasis)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ä®jungta (numatytasis)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Tinklo ryÅ¡ys"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Tiesioginis (numatytasis)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Nepavyko iÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Atrakinama..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Papildomi nustatymai"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Atsisakyti"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "PridÄ?ti"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Atgal"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "IÅ¡jungti"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Paleisti Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/lv/lv.po b/lv/lv.po
index e59e42a..4027d71 100644
--- a/lv/lv.po
+++ b/lv/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/otf/teams/1519/lv/)\n"
@@ -91,7 +91,7 @@ msgstr "MaldinoÅ¡i norÄ?dÄ«t visas MAC adreses (noklusÄ?juma vÄ?rtÄ«ba)"
 msgid "Don't spoof MAC addresses"
 msgstr "MaldinoÅ¡i nenorÄ?dÄ«t MAC adreses"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
 
@@ -129,24 +129,24 @@ msgid "Save Language & Region Settings"
 msgstr "SaglabÄ?t valodas un reÄ£iona iestatÄ«jumus"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Valoda"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "TastatÅ«ras izkÄ?rtojums"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "FormÄ?ti"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Laika zonas"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Å ifrÄ?ta pastÄ?vÄ«gÄ? krÄ?tuve"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -160,8 +160,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "AtslÄ?gt"
 
@@ -175,9 +175,9 @@ msgstr ""
 "JÅ«su pastÄ?vÄ«gÄ? krÄ?tuve ir atbloÄ·Ä?ta. RestartÄ?jiet Tails, lai to atkal "
 "bloÄ·Ä?tu."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Papildu iestatÄ«jumi"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -222,56 +222,72 @@ msgstr ""
 "iestatÄ«jumus, nospiediet tÄ?lÄ?k esoÅ¡o \"+\" pogu."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "IzslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "TÄ«kla savienojumi"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "TieÅ¡s (noklusÄ?juma vÄ?rtÄ«ba)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Tilti un starpniekserveri"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "BezsaistÄ?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "NeizdevÄ?s atkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "AtslÄ?dz..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Papildu iestatÄ«jumi"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Pievienot"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "AtpakaÄ¼"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "IzslÄ?gÅ¡ana"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "SÄ?kt Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/mg/mg.po b/mg/mg.po
index 6cd747e..4792ca5 100644
--- a/mg/mg.po
+++ b/mg/mg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Malagasy (https://www.transifex.com/otf/teams/1519/mg/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/mi/mi.po b/mi/mi.po
index eb4ad16..3fa2675 100644
--- a/mi/mi.po
+++ b/mi/mi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Maori (https://www.transifex.com/otf/teams/1519/mi/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/mk/mk.po b/mk/mk.po
index 1e93681..62e3350 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: orvel_mk <george.orwell50@xxxxxxxxx>, 2016\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ðµ"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ml/ml.po b/ml/ml.po
index 4656196..702b2a4 100644
--- a/ml/ml.po
+++ b/ml/ml.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/mn/mn.po b/mn/mn.po
index c80c3fa..eda38df 100644
--- a/mn/mn.po
+++ b/mn/mn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Mongolian (https://www.transifex.com/otf/teams/1519/mn/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/mr/mr.po b/mr/mr.po
index ead3b3c..e6f3823 100644
--- a/mr/mr.po
+++ b/mr/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vikrant Korde <vikrant.korde@xxxxxxxxx>, 2016\n"
 "Language-Team: Marathi (https://www.transifex.com/otf/teams/1519/mr/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à¤°à¤¦à¥?à¤¦ à¤?à¤°à¤¾"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à¤?à¥?à¤¡à¤¾"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po
index 7d3c7f3..3f9dbea 100644
--- a/ms_MY/ms_MY.po
+++ b/ms_MY/ms_MY.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mohd Shahril Bin Zainol Abidin <mohd_shahril_96@xxxxxxxxx>, 2016\n"
 "Language-Team: Malay (Malaysia) (https://www.transifex.com/otf/teams/1519/ms_MY/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Bahasa"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Tambah"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Kembali"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/mt/mt.po b/mt/mt.po
index 96d41de..dce1d84 100644
--- a/mt/mt.po
+++ b/mt/mt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Maltese (https://www.transifex.com/otf/teams/1519/mt/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/my/my.po b/my/my.po
index e44c93d..a9edc0d 100644
--- a/my/my.po
+++ b/my/my.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
+"Last-Translator: Thura Hlaing <trhura@xxxxxxxxx>, 2016\n"
 "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "á??á?¬á??á?¬á??á??á?¬á?¸"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "á?¡á?±á?¬á?·á??á?ºá??á?á?¯á??á?ºá?¸"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "á??á?»á??á?ºá??á?á??á?ºá?¸á??á??á?º"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "á??á?±á?¬á??á?ºá??á?á?¯á?·"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "á??á??á?ºá??á?á??á?ºá??á??á?º"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/nah/nah.po b/nah/nah.po
index b93d7e5..1b0b5b7 100644
--- a/nah/nah.po
+++ b/nah/nah.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Nahuatl (https://www.transifex.com/otf/teams/1519/nah/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/nap/nap.po b/nap/nap.po
index 7b9f406..6c47c8f 100644
--- a/nap/nap.po
+++ b/nap/nap.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Neapolitan (https://www.transifex.com/otf/teams/1519/nap/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/nb/nb.po b/nb/nb.po
index a758a15..3063991 100644
--- a/nb/nb.po
+++ b/nb/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Knut Ole <>, 2016\n"
 "Language-Team: Norwegian BokmÃ¥l (https://www.transifex.com/otf/teams/1519/nb/)\n"
@@ -91,7 +91,7 @@ msgstr "Simuler alle MAC-adresser (forvalg)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ikke simuler MAC-adresser"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Kan ikke lÃ¥se opp kryptert lagring med denne passordsekvensen."
 
@@ -129,24 +129,24 @@ msgid "Save Language & Region Settings"
 msgstr "Lagre sprÃ¥k- og regions -innstillinger"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "SprÃ¥k"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Tastauroppsett"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formater"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Tidssone"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Kryptert vedvarende lagring"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -160,8 +160,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "LÃ¥s opp"
 
@@ -174,9 +174,9 @@ msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 "Ditt vedvarende omrÃ¥de er lÃ¥st opp. En omstart av Tails vil lÃ¥se det igjen."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Ytterligere innstillinger"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -222,56 +222,72 @@ msgstr ""
 "egendefinert innstilling, trykk \"+\"-knappen nedenfor."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Av (forvalg)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "PÃ¥ (forvalg)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Nettverkstilkobling"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direkte (forvalg)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bro og mellomtjener"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Klarte ikke Ã¥ lÃ¥se vedvarende lagring igjen."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "LÃ¥ser oppâ?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Ytterligere innstillinger"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Legg til"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "SlÃ¥ av"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/nds/nds.po b/nds/nds.po
index d11b40a..acc23c2 100644
--- a/nds/nds.po
+++ b/nds/nds.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Low German (https://www.transifex.com/otf/teams/1519/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ne/ne.po b/ne/ne.po
index 4b258ee..5d32297 100644
--- a/ne/ne.po
+++ b/ne/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Nepali (https://www.transifex.com/otf/teams/1519/ne/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/nl/nl.po b/nl/nl.po
index 3913cc2..f12ab50 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: kwadronaut <kwadronaut@xxxxxxxxxxxxx>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
@@ -92,7 +92,7 @@ msgstr "Alle MAC adressen spoofen (standaard)"
 msgid "Don't spoof MAC addresses"
 msgstr "MAC adressen niet spoofen"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Kan versleutelde opslag niet ontgrendelen met deze wachtzin."
 
@@ -130,24 +130,24 @@ msgid "Save Language & Region Settings"
 msgstr "Bewaar Taal & Regio instellingen"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Taal"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Toetsenbordindeling"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formaten"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Tijdzone"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Versleutelde persistente opslag"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -161,8 +161,8 @@ msgstr "Versleutelde persistente opslag configureren"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Voer je wachtzin in om de persistente opslag te ontgrendelen."
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Ontgrendel"
 
@@ -176,9 +176,9 @@ msgstr ""
 "Je persistente opslag is ontgrendeld. Herstart Tails om het opnieuw te "
 "vergrendelen."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "bijkomende instellingen"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -223,56 +223,72 @@ msgstr ""
 "aangepaste instelling toe te voegen, klik op de \"+\"knop hieronder."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Uit (standaard)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Aan (standaard)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Netwerkverbinding"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Rechtstreeks (standaard)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bridge & Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Mislukt om de persistente opslag weer te vergrendelen."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Ontgrendelenâ?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "bijkomende instellingen"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Voeg toe"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Vorige"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Uitschakelen"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/nl_BE/nl_BE.po b/nl_BE/nl_BE.po
index 9f12c26..84b0816 100644
--- a/nl_BE/nl_BE.po
+++ b/nl_BE/nl_BE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Katrien Igodt <kigodt@xxxxxxxxx>, 2016\n"
 "Language-Team: Dutch (Belgium) (https://www.transifex.com/otf/teams/1519/nl_BE/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Taal"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/nn/nn.po b/nn/nn.po
index 447baf6..fc3b598 100644
--- a/nn/nn.po
+++ b/nn/nn.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
+"Last-Translator: BjÃ¸rn I. <bjorn.svindseth@xxxxxxxxx>, 2016\n"
 "Language-Team: Norwegian Nynorsk (https://www.transifex.com/otf/teams/1519/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "SprÃ¥k"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Tastaturoppsett"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Format"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Tidssone"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Fjern blokkering"
 
@@ -160,9 +160,9 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Tillegsinnstillingar"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -202,56 +202,72 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Av (standard)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "PÃ¥ (standard)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Nettverkssamband"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direkte (standard)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "FrÃ¥kopla"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Fjernar blokkering"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Tillegsinnstillingar"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Avbrjot"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Legg til"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Tilbake"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/nso/nso.po b/nso/nso.po
index eb81221..c7d4b25 100644
--- a/nso/nso.po
+++ b/nso/nso.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Northern Sotho (https://www.transifex.com/otf/teams/1519/nso/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/oc/oc.po b/oc/oc.po
index b3a1ec9..89c86ad 100644
--- a/oc/oc.po
+++ b/oc/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Occitan (post 1500) (https://www.transifex.com/otf/teams/1519/oc/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/om/om.po b/om/om.po
index 7f39728..0b810a7 100644
--- a/om/om.po
+++ b/om/om.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Oromo (https://www.transifex.com/otf/teams/1519/om/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/or/or.po b/or/or.po
index 3f27973..c580008 100644
--- a/or/or.po
+++ b/or/or.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Oriya (https://www.transifex.com/otf/teams/1519/or/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/pa/pa.po b/pa/pa.po
index 5b0fb56..40bbec7 100644
--- a/pa/pa.po
+++ b/pa/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: A S Alam <apreet.alam@xxxxxxxxx>, 2016\n"
 "Language-Team: Panjabi (Punjabi) (https://www.transifex.com/otf/teams/1519/pa/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à¨°à©±à¨¦ à¨?à¨°à©?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à¨¶à¨¾à¨®à¨¿à¨²"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "à¨¬à©°à¨¦ à¨?à¨°à©?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/pap/pap.po b/pap/pap.po
index 868f0e6..a580619 100644
--- a/pap/pap.po
+++ b/pap/pap.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Papiamento (https://www.transifex.com/otf/teams/1519/pap/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/pl/pl.po b/pl/pl.po
index 41320d9..46e5b20 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Marcin S <dzidek1003@xxxxx>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
@@ -92,7 +92,7 @@ msgstr "FaÅ?szuj wszystkie adresy MAC (domyÅ?lne)"
 msgid "Don't spoof MAC addresses"
 msgstr "Nie faÅ?szuj adresu MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Nie moÅ¼na odblokowaÄ? zaszyfrowanej pamiÄ?ci z tym hasÅ?em."
 
@@ -128,24 +128,24 @@ msgid "Save Language & Region Settings"
 msgstr "Zapisz ustawienia JÄ?zyka i Lokalizacji"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "JÄ?zyk"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "UkÅ?ad Kalwiatury"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formaty"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Strefa Czasowa"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Zaszyfruj PamiÄ?Ä? TrwaÅ?Ä?"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -159,8 +159,8 @@ msgstr "Skonfiguruj PamiÄ?Ä? TrwaÅ?Ä?"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Wpisz Twoje hasÅ?o do odblokowania przechowania danych"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Odblokuj"
 
@@ -172,9 +172,9 @@ msgstr "Ponownie zablokuj PamiÄ?Ä? TrwaÅ?Ä?"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Dodatkowe Ustawienia"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -219,56 +219,72 @@ msgstr ""
 "ustawienie , kliknij \"+\" poniÅ¼ej."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "WyÅ?Ä?czony (domyÅ?lny)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "WÅ?Ä?czony (domyÅ?lny)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "PoÅ?Ä?czenie sieciowe"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "PoÅ?Ä?cz (domyÅ?lny)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Mostek i Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Poza zasiÄ?giem"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Nie udaÅ?o siÄ? ponownie zablokowaÄ? PamiÄ?ci TrwaÅ?ej."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Odblokowanie ..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Dodatkowe Ustawienia"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "wstecz"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "WyÅ?Ä?czenie"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/pms/pms.po b/pms/pms.po
index ad010e7..f65ef05 100644
--- a/pms/pms.po
+++ b/pms/pms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Piemontese (https://www.transifex.com/otf/teams/1519/pms/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ps/ps.po b/ps/ps.po
index 3fc184d..5e3e659 100644
--- a/ps/ps.po
+++ b/ps/ps.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Pushto (https://www.transifex.com/otf/teams/1519/ps/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/pt/pt.po b/pt/pt.po
index c8bbef8..e3d042a 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alberto Castro <albertdcastro@xxxxxxxxx>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/otf/teams/1519/pt/)\n"
@@ -91,7 +91,7 @@ msgstr "Mascarar todos endereÃ§os MAC (predefiniÃ§Ã£o)"
 msgid "Don't spoof MAC addresses"
 msgstr "NÃ£o mascarar endereÃ§os MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "NÃ£o Ã© possÃvel desbloquear o armazenamento encriptado com esta frase de "
@@ -131,24 +131,24 @@ msgid "Save Language & Region Settings"
 msgstr "Guardar ConfiguraÃ§Ãµes do Idioma e RegiÃ£o"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Idioma"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "DisposiÃ§Ã£o do Teclado"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formatos"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Zona HorÃ¡ria"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Armazenamento Persistente encriptado"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -164,8 +164,8 @@ msgstr ""
 "Insira a sua frase de palavra-passe para desbloquear o armazenamento "
 "persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Desbloquear"
 
@@ -179,9 +179,9 @@ msgstr ""
 "O seu armazenamento persistente encontra-se desbloqueado. Reinicie o Tails "
 "para bloqueÃ¡-lo novamente."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ConfiguraÃ§Ãµes Adicionais"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -226,56 +226,72 @@ msgstr ""
 "adicionar uma definiÃ§Ã£o personalizada, pressione no botÃ£o abaixo \"+\"."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Desativado (predefiniÃ§Ã£o)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ativado (predefiniÃ§Ã£o)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "LigaÃ§Ã£o de Rede"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direto (predefiniÃ§Ã£o)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Ponte e Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Off-line"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "NÃ£o foi possÃvel voltar a bloquear o armazenamento persistente."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "A desbloquear..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ConfiguraÃ§Ãµes Adicionais"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Anterior"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Encerrar"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Iniciar Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 47cff07..80d155c 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01@xxxxxxxxxxxx>, 2016\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
@@ -91,7 +91,7 @@ msgstr "Marcarar a identidade de todos os endereÃ§os MAC (padrÃ£o)"
 msgid "Don't spoof MAC addresses"
 msgstr "NÃ£o mascarar a identidade de endereÃ§os MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 "NÃ£o foi possÃvel abrir o dispositivo de armazenamento criptografado com esta"
@@ -131,24 +131,24 @@ msgid "Save Language & Region Settings"
 msgstr "Salvar ConfiguraÃ§Ãµes de Idioma & RegiÃ£o"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Idioma"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Modelo de Teclado"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formatos"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Zona HorÃ¡ria"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Armazenamento Criptografado Persistent"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -164,8 +164,8 @@ msgstr ""
 "Inserir a sua frase-senha para abrir o dispositivo de armazenamento "
 "persistente"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Abrir"
 
@@ -179,9 +179,9 @@ msgstr ""
 "O seu volume de armazenamento persistente estÃ¡ aberto. Reiniciar Tails para "
 "bloqueÃ¡-lo novamente."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "ConfiguraÃ§Ãµes Adicionais"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -226,56 +226,72 @@ msgstr ""
 "configuraÃ§Ãµes personalizadas, clique na tecla \"+\" abaixo."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Desativar (padrÃ£o)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ativar (padrÃ£o)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "ConexÃ£o de Rede"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direta (padrÃ£o)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Ponte & Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "sem linha"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Falha ao fechar de novo o dispositivo de armazenamento Persistent ."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Abrindo..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "ConfiguraÃ§Ãµes Adicionais"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Voltar"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Desligar"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Iniciar Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/ro/ro.po b/ro/ro.po
index 8a528ad..6b44d0b 100644
--- a/ro/ro.po
+++ b/ro/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: drazvan <razvan.net@xxxxxxxxx>, 2017\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
@@ -84,7 +84,7 @@ msgstr "FalsificÄ? toate adresele MAC (implicit)"
 msgid "Don't spoof MAC addresses"
 msgstr "Nu falsifica adresele MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -118,24 +118,24 @@ msgid "Save Language & Region Settings"
 msgstr "SalveazÄ? setÄ?rile de LimbÄ? È?i Regiune"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "LimbÄ?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formate"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Fus orar"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Stocare persistentÄ? criptatÄ?"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -149,8 +149,8 @@ msgstr "ConfigureazÄ? stocarea persistentÄ?"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Introdu parola ta pentru a debloca stocarea persistentÄ?."
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "DeblocheazÄ?"
 
@@ -162,9 +162,9 @@ msgstr "BlocheazÄ? din nou Stocarea persistentÄ?"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "SetÄ?ri adiÈ?ionale"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -209,56 +209,72 @@ msgstr ""
 "setare personalizatÄ?, apasÄ? pe butonul \"+\" de mai jos."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Dezactivat (implicit)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Activat (implicit)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Conexiune reÈ?ea"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direct (implicit)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bridge È?i Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Deconectat"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Se deblocheazÄ?..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "SetÄ?ri adiÈ?ionale"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "RenunÈ?Ä?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "AdaugÄ?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ã?napoi"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Inchide"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "PorneÅ?te Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/ru/ru.po b/ru/ru.po
index de01a4d..5d85f10 100644
--- a/ru/ru.po
+++ b/ru/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Oleg Sergeev <djvnsk@xxxxx>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n"
@@ -92,7 +92,7 @@ msgstr "Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° Ð²Ñ?ÐµÑ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 msgid "Don't spoof MAC addresses"
 msgstr "Ð?Ðµ Ð¿Ð¾Ð´Ð¼ÐµÐ½Ñ?Ñ?Ñ? MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°ÐµÑ?Ñ?Ñ? Ð¾Ñ?ÐºÑ?Ñ?Ñ?Ñ? Ð·Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?Ð¾Ð¹ ÐºÐ»Ñ?Ñ?ÐµÐ²Ð¾Ð¹ Ñ?Ñ?Ð°Ð·Ð¾Ð¹."
 
@@ -128,24 +128,24 @@ msgid "Save Language & Region Settings"
 msgstr "Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð·Ñ?Ðº Ð¸ Ñ?ÐµÐ³Ð¸Ð¾Ð½Ð°Ð»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ð¯Ð·Ñ?Ðº"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Ð Ð°Ñ?ÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°Ñ?Ñ?Ñ?Ñ?"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ñ?"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Ð§Ð°Ñ?Ð¾Ð²Ð¾Ð¹ Ð¿Ð¾Ñ?Ñ?"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -159,8 +159,8 @@ msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Ð?Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð²Ð°Ñ?Ñ? ÐºÐ»Ñ?Ñ?ÐµÐ²Ñ?Ñ? Ñ?Ñ?Ð°Ð·Ñ? Ð´Ð»Ñ? Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ð³Ð¾ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ð°"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
@@ -174,9 +174,9 @@ msgstr ""
 "Ð?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ð¾. Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ðµ Tails, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ð½Ð¾Ð²Ð° "
 "Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -222,56 +222,72 @@ msgstr ""
 "Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ?Ñ?ÐºÐ¾Ð¹ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸, Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ ÐºÐ½Ð¾Ð¿ÐºÑ? \"+\" Ð½Ð¸Ð¶Ðµ."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Ð?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Ð¡ÐµÑ?ÐµÐ²Ð¾Ðµ Ð¿Ð¾Ð´ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Ð?Ñ?Ñ?Ð¼Ð¾Ð¹ (Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Ð?Ð¾Ñ?Ñ? Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Ð?Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ°..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð?Ñ?Ð¼ÐµÐ½Ð°"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Ð?Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/ru@petr1708/ru@xxxxxxxxxxx b/ru@petr1708/ru@xxxxxxxxxxx
index 261f9a4..5c376b8 100644
--- a/ru@petr1708/ru@xxxxxxxxxxx
+++ b/ru@petr1708/ru@xxxxxxxxxxx
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: alvina alexandrova <alvina_alexandrova@xxxxxxx>, 2016\n"
 "Language-Team: Russian Petrine orthography (https://www.transifex.com/otf/teams/1519/ru@petr1708/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ð?Ð¾Ð±Ð°Ð²Ð¸Ñ?Ñ?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?Ðµ"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/scn/scn.po b/scn/scn.po
index edc9077..5de8ce6 100644
--- a/scn/scn.po
+++ b/scn/scn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Sicilian (https://www.transifex.com/otf/teams/1519/scn/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sco/sco.po b/sco/sco.po
index 577f006..bff0229 100644
--- a/sco/sco.po
+++ b/sco/sco.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: John Reid <john.reid036@xxxxxxxxx>, 2016\n"
 "Language-Team: Scots (https://www.transifex.com/otf/teams/1519/sco/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Turn-aff"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/si_LK/si_LK.po b/si_LK/si_LK.po
index 762387f..53bd464 100644
--- a/si_LK/si_LK.po
+++ b/si_LK/si_LK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Randika Dilshan Pathirage <randika.pathirage@xxxxxxxxx>, 2016\n"
 "Language-Team: Sinhala (Sri Lanka) (https://www.transifex.com/otf/teams/1519/si_LK/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à¶·à·?à·?à·?à·?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "à¶±à·?à¶¶à·?à¶¯à·?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à¶?à·?à¶½à¶?à¶?à·? à¶?à¶»à¶±à·?à¶±"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à¶?à¶?à¶à·? à¶?à¶»à¶±à·?à¶±"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "à¶´à·?à·?à¶´à·?à¶§"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "à·?à·?à¶±à·?à¶±"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sk/sk.po b/sk/sk.po
index b4ed431..c6eb6d8 100644
--- a/sk/sk.po
+++ b/sk/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Stanislav TomÃ¡Å¡ <stanislav.tomas@xxxxxxxxxx>, 2016\n"
 "Language-Team: Slovak (https://www.transifex.com/otf/teams/1519/sk/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jazyk"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "NepripojenÃ½"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ZruÅ¡iÅ¥"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "PridaÅ¥"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "SpÃ¤Å¥"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po
index df33f8b..9b15d91 100644
--- a/sk_SK/sk_SK.po
+++ b/sk_SK/sk_SK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Juraj CigÃ¡Å? <kusavica@xxxxxxxxx>, 2017\n"
 "Language-Team: Slovak (Slovakia) (https://www.transifex.com/otf/teams/1519/sk_SK/)\n"
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -118,23 +118,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jazyk"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Ä?asovÃ© pÃ¡smo"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -149,8 +149,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -162,8 +162,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -204,55 +204,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
+msgstr ""
+
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ZruÅ¡iÅ¥"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "PridaÅ¥"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "SpÃ¤Å¥"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Vypnutie"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sl/sl.po b/sl/sl.po
index aa10cc5..579d7e5 100644
--- a/sl/sl.po
+++ b/sl/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Matija <matija@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Slovenian (https://www.transifex.com/otf/teams/1519/sl/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jezik"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "PrekliÄ?i"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Nazaj"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ugasni"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sl_SI/sl_SI.po b/sl_SI/sl_SI.po
index 3b68943..a87a39e 100644
--- a/sl_SI/sl_SI.po
+++ b/sl_SI/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Matija <matija@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/otf/teams/1519/sl_SI/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jezik"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "PrekliÄ?i"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Izklop"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sn/sn.po b/sn/sn.po
index 70148c4..605c9b5 100644
--- a/sn/sn.po
+++ b/sn/sn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Shona (https://www.transifex.com/otf/teams/1519/sn/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/so/so.po b/so/so.po
index 2b1a3dc..f99d0ab 100644
--- a/so/so.po
+++ b/so/so.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Somali (https://www.transifex.com/otf/teams/1519/so/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/son/son.po b/son/son.po
index b78f674..f58da39 100644
--- a/son/son.po
+++ b/son/son.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Songhay (https://www.transifex.com/otf/teams/1519/son/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sq/sq.po b/sq/sq.po
index ec80af2..a4cc0c3 100644
--- a/sq/sq.po
+++ b/sq/sq.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: runasand <inactive+runasand@xxxxxxxxxxxxx>, 2016\n"
+"Last-Translator: Bujar Tafili <bujartafili@xxxxxxxxx>, 2016\n"
 "Language-Team: Albanian (https://www.transifex.com/otf/teams/1519/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Gjuha"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "I shkÃ«putur"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Hiqeni"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Shtoni"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Mbrapa"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Mbylleni"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sr/sr.po b/sr/sr.po
index 55f46d4..833739e 100644
--- a/sr/sr.po
+++ b/sr/sr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jezik"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ð?Ñ?Ð»Ð°Ñ?Ð½"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ð?Ð°Ñ?ÐµÑ?Ðµ"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sr@latin/sr@xxxxxxxx b/sr@latin/sr@xxxxxxxx
index d82873e..5b58a0a 100644
--- a/sr@latin/sr@xxxxxxxx
+++ b/sr@latin/sr@xxxxxxxx
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Milenko Doder <svrsavamutebe@xxxxxxxxx>, 2016\n"
 "Language-Team: Serbian (Latin) (https://www.transifex.com/otf/teams/1519/sr@latin/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Jezik"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/st/st.po b/st/st.po
index 5f1b61c..7fd69d0 100644
--- a/st/st.po
+++ b/st/st.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Sotho, Southern (https://www.transifex.com/otf/teams/1519/st/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/su/su.po b/su/su.po
index cb7f279..ee0e01c 100644
--- a/su/su.po
+++ b/su/su.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Sundanese (https://www.transifex.com/otf/teams/1519/su/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/sv/sv.po b/sv/sv.po
index 317a879..299c378 100644
--- a/sv/sv.po
+++ b/sv/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Bo Serrander <bserrander@xxxxxxxxx>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n"
@@ -89,7 +89,7 @@ msgstr "Fejka alla MAC-adresser (standard)"
 msgid "Don't spoof MAC addresses"
 msgstr "Fejka alla MAC-adresser"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Kan inte att lÃ¥sa upp krypterad lagring med detta lÃ¶senord."
 
@@ -126,24 +126,24 @@ msgid "Save Language & Region Settings"
 msgstr "Spara SprÃ¥k och region instÃ¤llningar"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "SprÃ¥k"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Tangentbordslayout"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Format"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Tidszon"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Krypterad bestÃ¥ende lagring"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -157,8 +157,8 @@ msgstr "Konfigurera bestÃ¥ende lagring"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "Mata in din lÃ¶senordfras fÃ¶r att lÃ¥sa upp den bestÃ¥ende lagringren"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "LÃ¥sa upp"
 
@@ -170,9 +170,9 @@ msgstr "LÃ¥s igen bestÃ¤ndig lagring"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Ytterligare instÃ¤llningar"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -217,56 +217,72 @@ msgstr ""
 " en anpassad instÃ¤llning, trycka pÃ¥ \"+\"-knappen nedan."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Av (standard)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "PÃ¥ (standard)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "NÃ¤tverksanslutning"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direkt (standard)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bro & Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Misslyckades att lÃ¥sa igen bestÃ¤ndig lagring."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "LÃ¥ser upp..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Ytterligare instÃ¤llningar"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "LÃ¤gg till"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Tillbaka"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "StÃ¤ng av"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Starta Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/sw/sw.po b/sw/sw.po
index 7156a7f..f3ebae9 100644
--- a/sw/sw.po
+++ b/sw/sw.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/szl/szl.po b/szl/szl.po
index 11261e0..3af9921 100644
--- a/szl/szl.po
+++ b/szl/szl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Silesian (https://www.transifex.com/otf/teams/1519/szl/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ta/ta.po b/ta/ta.po
index ae8a1b6..4ee42c3 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Jose moses antony <jmsanto123@xxxxxxxx>, 2016\n"
 "Language-Team: Tamil (https://www.transifex.com/otf/teams/1519/ta/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à®®à¯?à®´à®¿"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à®°à®¤à¯?à®¤à¯?à®?à¯?à®¯à¯?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à®?à¯?à®°à¯?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/te/te.po b/te/te.po
index bab5277..90ff5fa 100644
--- a/te/te.po
+++ b/te/te.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Telugu (https://www.transifex.com/otf/teams/1519/te/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/te_IN/te_IN.po b/te_IN/te_IN.po
index 15558df..3436323 100644
--- a/te_IN/te_IN.po
+++ b/te_IN/te_IN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Telugu (India) (https://www.transifex.com/otf/teams/1519/te_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/templates/tails-greeter-2.pot b/templates/tails-greeter-2.pot
index b719c16..e34cfa5 100644
--- a/templates/tails-greeter-2.pot
+++ b/templates/tails-greeter-2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -90,7 +90,7 @@ msgstr "Spoof all MAC addresses (default)"
 msgid "Don't spoof MAC addresses"
 msgstr "Don't spoof MAC addresses"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Cannot unlock encrypted storage with this passphrase."
 
@@ -127,24 +127,24 @@ msgid "Save Language & Region Settings"
 msgstr "Save Language & Region Settings"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Language"
+msgid "_Language"
+msgstr "_Language"
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "Keyboard Layout"
+msgid "_Keyboard Layout"
+msgstr "_Keyboard Layout"
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Formats"
+msgid "_Formats"
+msgstr "_Formats"
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Time Zone"
+msgid "_Time Zone"
+msgstr "_Time Zone"
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -158,8 +158,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Unlock"
 
@@ -171,9 +171,9 @@ msgstr "Relock Persistent Storage"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -218,56 +218,72 @@ msgstr ""
 "press the \"+\" button below."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr "_Administration Password"
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Off (default)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "On (default)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Network Connection"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr "_Network Connection"
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Direct (default)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr "_Windows Camouflage"
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Bridge & Proxy"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Offline"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "Failed to relock persistent storage."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Unlockingâ?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Additional Settings"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Add"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Back"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr "_Start Tails"
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/tg/tg.po b/tg/tg.po
index f2921d8..8b026f3 100644
--- a/tg/tg.po
+++ b/tg/tg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Tajik (https://www.transifex.com/otf/teams/1519/tg/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/th/th.po b/th/th.po
index 6f4c7cb..836a507 100644
--- a/th/th.po
+++ b/th/th.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: kanesayan gwangsai <thailand.1.2009.00067.77.9@xxxxxxxxx>, 2016\n"
 "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "à¸ à¸²à¸©à¸²"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "à¹?à¸?à¸?à¹?à¸§à¸¥à¸²"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "à¸?à¸¥à¸?à¸¥à¹?à¸à¸?"
 
@@ -160,9 +160,9 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "à¸?à¸´à¸? (à¹?à¸?à¸¢à¸?à¸£à¸´à¸¢à¸²à¸¢)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "à¹?à¸?à¸´à¸? (à¹?à¸?à¸¢à¸?à¸£à¸´à¸¢à¸²à¸¢)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "à¸à¸à¸?à¹?à¸¥à¸?à¹?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "à¸?à¸³à¸¥à¸±à¸?à¸?à¸¥à¸?à¸¥à¹?à¸à¸?..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "à¸?à¸±à¹?à¸?à¸?à¹?à¸²à¹?à¸?à¸´à¹?à¸¡à¹?à¸?à¸´à¸¡"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "à¸¢à¸?à¹?à¸¥à¸´à¸?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "à¹?à¸?à¸´à¹?à¸¡"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "à¸?à¸¥à¸±à¸?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ti/ti.po b/ti/ti.po
index f4ea1cf..95ea432 100644
--- a/ti/ti.po
+++ b/ti/ti.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Tigrinya (https://www.transifex.com/otf/teams/1519/ti/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/tk/tk.po b/tk/tk.po
index 5a9042d..b6217cf 100644
--- a/tk/tk.po
+++ b/tk/tk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Turkmen (https://www.transifex.com/otf/teams/1519/tk/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/tr/tr.po b/tr/tr.po
index 7adad47..739a2ea 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Yasin Ã?zel <iletisim@xxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
@@ -91,7 +91,7 @@ msgstr "TÃ¼m MAC adresleri yanÄ±ltÄ±lsÄ±n (varsayÄ±lan)"
 msgid "Don't spoof MAC addresses"
 msgstr "MAC adresleri yanÄ±ltÄ±lmasÄ±n"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "Bu parola ile Å?ifreli depolama alanÄ±nÄ±n kilidi aÃ§Ä±lamadÄ±."
 
@@ -127,24 +127,24 @@ msgid "Save Language & Region Settings"
 msgstr "Dil ve BÃ¶lge AyarlarÄ±nÄ± Kaydet"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Dil"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "TuÅ? TakÄ±mÄ± DÃ¼zeni"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "BiÃ§imler"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "Saat Dilimi"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Å?ifreli KalÄ±cÄ± Depolama"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -158,8 +158,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Kilidi AÃ§"
 
@@ -173,9 +173,9 @@ msgstr ""
 "KalÄ±cÄ± depolama kilidi aÃ§Ä±ldÄ±. Yeniden kilitlemek iÃ§in Tails uygulamasÄ±nÄ± "
 "yeniden baÅ?latÄ±n."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Ek Ayarlar"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -221,56 +221,72 @@ msgstr ""
 " eklemek iÃ§in aÅ?aÄ?Ä±daki \"+\" dÃ¼Ä?mesine tÄ±klayÄ±n."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "KapalÄ± (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "AÃ§Ä±k (varsayÄ±lan)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "AÄ? BaÄ?lantÄ±sÄ±"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "DoÄ?rudan (varsayÄ±lan)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ã?evrim DÄ±Å?Ä±"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Kilit aÃ§Ä±lÄ±yor..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Ek Ayarlar"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ekle"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Geri"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Kapat"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Tails BaÅ?latÄ±lsÄ±n"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/tzm/tzm.po b/tzm/tzm.po
index 86bbc31..c285ed2 100644
--- a/tzm/tzm.po
+++ b/tzm/tzm.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: Central Atlas Tamazight (https://www.transifex.com/otf/teams/1519/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -115,23 +115,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -146,8 +146,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -159,8 +159,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -201,55 +201,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ug@Arab/ug@xxxxxxx b/ug@Arab/ug@xxxxxxx
index 0a95261..a166c7a 100644
--- a/ug@Arab/ug@xxxxxxx
+++ b/ug@Arab/ug@xxxxxxx
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: crash x <xmr.crashx@xxxxxxxxx>, 2016\n"
 "Language-Team: Uighur (Arabic) (https://www.transifex.com/otf/teams/1519/ug@Arab/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ø§Ù?Ù?ØºØ©"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "ØºÙ?Ø± Ù?ØªØµÙ?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ø¥Ù?ØºØ§Ø¡"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ø¥Ø¶Ø§Ù?Ø©"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/uk/uk.po b/uk/uk.po
index 97b1902..3d45027 100644
--- a/uk/uk.po
+++ b/uk/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Konstantin Tiler <inactive+tilersever@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ð?Ð¾Ð²Ð°"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ð?Ñ?Ð»Ð°Ð¹Ð½"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°Ñ?Ñ?Ð²Ð°Ñ?Ð¸"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ð?Ð°Ð·Ð°Ð´"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ur/ur.po b/ur/ur.po
index 7207525..49c6c24 100644
--- a/ur/ur.po
+++ b/ur/ur.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: A. Saad Imran <ad_min96@xxxxxxxxxxx>, 2016\n"
 "Language-Team: Urdu (https://www.transifex.com/otf/teams/1519/ur/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "ØªÙ?Ø³Û?Ø® Ú©Û?Ø¬Û?Û?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ur_PK/ur_PK.po b/ur_PK/ur_PK.po
index 69a5ca3..09c9a6e 100644
--- a/ur_PK/ur_PK.po
+++ b/ur_PK/ur_PK.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Muhammad Ishaq <ishaq@xxxxxxxxx>, 2016\n"
+"Last-Translator: Umar Hayat <m.umarkiani@xxxxxxxxx>, 2016\n"
 "Language-Team: Urdu (Pakistan) (https://www.transifex.com/otf/teams/1519/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Ø²Ø¨Ø§Ù?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ø§Ù?Ù? Ù?Ø§Ø¦Ù?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Ù?Ù?Ø³Ù?Ø®"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Ù¾Û?Ú?Ú¾Û?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Ø¨Ù?Ø¯Ú¾ Ú©Ø±Û?Úº"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/uz/uz.po b/uz/uz.po
index a0cd372..9471d5f 100644
--- a/uz/uz.po
+++ b/uz/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Umidjon Almasov <u.almasov@xxxxxxxxx>, 2016\n"
 "Language-Team: Uzbek (https://www.transifex.com/otf/teams/1519/uz/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "Til"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/ve/ve.po b/ve/ve.po
index f9c0468..3a7f726 100644
--- a/ve/ve.po
+++ b/ve/ve.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Venda (https://www.transifex.com/otf/teams/1519/ve/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/vi/vi.po b/vi/vi.po
index 6a362ea..fe5b9b5 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Acooldude <chibqc@xxxxxxxxx>, 2016\n"
 "Language-Team: Vietnamese (https://www.transifex.com/otf/teams/1519/vi/)\n"
@@ -90,7 +90,7 @@ msgstr "LÃ m giáº£ táº¥t cáº£ Ä?á»?a chá»? MAC (máº·c Ä?á»?nh)"
 msgid "Don't spoof MAC addresses"
 msgstr "KhÃ´ng lÃ m giáº£ Ä?á»?a chá»? MAC"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 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."
 
@@ -128,24 +128,24 @@ msgid "Save Language & Region Settings"
 msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t vá»? ngÃ´n ngá»¯ vÃ  vÃ¹ng"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "NgÃ´n ngá»¯"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "CÃ¡ch bá»? trÃ bÃ n phÃm"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "Nhá»¯ng khuÃ´n máº«u"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "MÃºi giá»?"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "Dung lÆ°á»£ng bá»?n vá»¯ng Ä?Æ°á»£c mÃ£ hÃ³a"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -159,8 +159,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:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "Má»? khÃ³a"
 
@@ -174,9 +174,9 @@ msgstr ""
 "PhÃ¢n vÃ¹ng lÆ°u trá»¯ bá»?n vá»¯ng cá»§a báº¡n bá»? má»? khoÃ¡. Khá»?i Ä?á»?ng láº¡i Tails Ä?á»? khoÃ¡ "
 "nÃ³ láº¡i."
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "Nhá»¯ng cÃ i Ä?áº·t thÃªm"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -221,56 +221,72 @@ msgstr ""
 "cÃ i Ä?áº·t riÃªng, báº¥m nÃºt \"+\" bÃªn dÆ°á»?i."
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "Táº¯t (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "Má»? (máº·c Ä?á»?nh)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "Káº¿t ná»?i máº¡ng lÆ°á»?i"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "Trá»±c tiáº¿p (máº·c Ä?á»?nh)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "Cáº§u ná»?i & á»¦y quyá»?n"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "Ngoáº¡i tuyáº¿n"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 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:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "Ä?ang má»? khÃ³a..."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "Nhá»¯ng cÃ i Ä?áº·t thÃªm"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Huá»· bá»?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "ThÃªm vÃ o"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "Trá»? vá»?"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Táº¯t trÃ¬nh duyá»?t"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "Khá»?i Ä?á»?ng Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/wa/wa.po b/wa/wa.po
index 2d6857e..a53a360 100644
--- a/wa/wa.po
+++ b/wa/wa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Walloon (https://www.transifex.com/otf/teams/1519/wa/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/wo/wo.po b/wo/wo.po
index c57ff22..8051d64 100644
--- a/wo/wo.po
+++ b/wo/wo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Wolof (https://www.transifex.com/otf/teams/1519/wo/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 5f2b4a9..696ab01 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Chi-Hsun Tsai <chihsun.tsai@xxxxxxxxx>, 2016\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
@@ -84,7 +84,7 @@ msgstr "æ¬ºéª?æ??æ?? MAC å?°å??ï¼?é»?è®¤ï¼?"
 msgid "Don't spoof MAC addresses"
 msgstr "ä¸?æ¬ºéª?ä»»ä½? MAC å?°å??"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "æ? æ³?ç?¨æ¤å¯?ç ?è§£é??å? å¯?ç??å?å?¨ã??"
 
@@ -118,24 +118,24 @@ msgid "Save Language & Region Settings"
 msgstr "ä¿?å?è¯è¨?å??å?ºå??è®¾ç½®"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "è¯è¨?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "é?®ç??å¸?å±?"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "æ ¼å¼?"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "æ?¶å?º"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "å? å¯?æ??ä¹?å?å?¨"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -149,8 +149,8 @@ msgstr "é??ç½®æ??ä¹?å?å?¨"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "è¯·è¾?å?¥æ?¨ç??å¯?ç ?ä»¥è§£é??æ??ä¹?å?å?¨"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "è§£é??"
 
@@ -162,9 +162,9 @@ msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "æ?¨ç??æ??ä¹?å?å?¨å·²è§£é??ã??é??å?¯ Tails ä»¥å??æ¬¡é??å®?å®?ã??"
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "é¢?å¤?è®¾ç½®"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -204,56 +204,72 @@ msgid ""
 msgstr "é»?è®¤è®¾ç½®å?¨å¤§å¤?æ?°æ??å?µä¸?æ?¯å®?å?¨ç??ã??è¦?æ·»å? è?ªå®?ä¹?è®¾ç½®ï¼?ç?¹å?»ä¸?é?¢ç?? + æ??é?®ã??"
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "å?³é?ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "å¼?å?¯ï¼?é»?è®¤ï¼?"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "ç½?ç»?è¿?æ?¥"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "ç?´æ?¥ï¼?é»?è®¤ï¼?"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "ç½?æ¡¥å??ä»£ç??"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "ç¦»çº¿"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨å¤±è´¥ã??"
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "æ£å?¨è§£é??â?¦"
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "é¢?å¤?è®¾ç½®"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "æ·»å? "
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "ä¸?ä¸?æ¥"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "å?³é?"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "å?¯å?¨ Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index fe4a6eb..799e287 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: å¤§å??æ´?è?¥ <inactive+kinkwok@xxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Chinese (Hong Kong) (https://www.transifex.com/otf/teams/1519/zh_HK/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "èª?è¨?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "é?¢ç·?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "å? å?¥"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "é?¢é??"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119
diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po
index c710320..394e2a7 100644
--- a/zh_TW/zh_TW.po
+++ b/zh_TW/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Chi-Hsun Tsai <chihsun.tsai@xxxxxxxxx>, 2017\n"
 "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n"
@@ -83,7 +83,7 @@ msgstr "å?½è£?æ??æ??ç??ç¶²è·¯å?¡å¯¦é«?ä½?å??(é ?è¨)"
 msgid "Don't spoof MAC addresses"
 msgstr "ä¸?è¦?å?½è£?ç¶²è·¯å?¡å¯¦é«?ä½?å??"
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr "æ¤é??é??å¯?èª?ç?¡æ³?è§£é??å? å¯?ç??å?²å?è£?ç½®ã??"
 
@@ -117,24 +117,24 @@ msgid "Save Language & Region Settings"
 msgstr "å?²å?èª?è¨?è??å??å??ç??è¨å®?å?¼"
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
-msgstr "èª?è¨?"
+msgid "_Language"
+msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
-msgstr "é?µç?¤ä½?å±?"
+msgid "_Keyboard Layout"
+msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
-msgstr "æ ¼å¼?"
+msgid "_Formats"
+msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
-msgstr "æ??å??"
+msgid "_Time Zone"
+msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
-msgstr "å? å¯?ä¹?æ°¸ä¹?æ?§å?²å?è£?ç½®"
+msgid "Encrypted _Persistent Storage"
+msgstr ""
 
 #: ../data/greeter.ui.h:30
 msgid "Show Passphrase"
@@ -148,8 +148,8 @@ msgstr "è¨å®?æ°¸ä¹?æ?§å?²å?è£?ç½®"
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr "è«?è¼¸å?¥å¯?ç¢¼ä»¥ä¾¿è§£é??æ°¸ä¹?æ?§å?²å?è£?ç½®"
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr "è§£é??"
 
@@ -161,9 +161,9 @@ msgstr "é??æ?°é??å®?æ°¸ä¹?æ?§å?²å?è£?ç½®"
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr "æ°¸ä¹?å?²å?å??ä¸¦æ?ªå? é??ï¼?é??å??Tailsäº?ä»¥ä¸?é??"
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
-msgstr "é¡?å¤?ç??è¨å®?"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
+msgstr ""
 
 #: ../data/greeter.ui.h:37
 msgid "Save Additional Settings"
@@ -203,56 +203,72 @@ msgid ""
 msgstr "å?¨å¤§å¤?æ?¸ç??æ??æ³?ä¸?ï¼?é ?è¨ç??è¨å®?å?¼æ?¯å¾?å®?å?¨ç??ã??è?¥æ?¨æ?³è¦?å¢?å? å??äººå??ç??è¨å®?ï¼?è«?æ??ä¸?æ?¹ç??ã??+ã??æ??é??ã??"
 
 #: ../data/greeter.ui.h:45
+msgid "_Administration Password"
+msgstr ""
+
+#: ../data/greeter.ui.h:46
 msgid "Off (default)"
 msgstr "é??é??(é ?è¨)"
 
-#: ../data/greeter.ui.h:46
+#: ../data/greeter.ui.h:47
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
 msgid "On (default)"
 msgstr "å??ç?¨(é ?è¨)"
 
-#: ../data/greeter.ui.h:47
-msgid "Network Connection"
-msgstr "ç¶²è·¯é?£ç·?"
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr "ç?´æ?¥(é ?è¨)"
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr "æ©?æ?¥å?¨è??ä»£ç??ä¼ºæ??å?¨"
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr "é?¢ç·?"
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr "æ°¸ä¹?æ?§å?²å?è£?ç½®é??æ?°é??å®?å¤±æ??ã??"
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr "è§£é??ä¸...."
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr "é¡?å¤?ç??è¨å®?"
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr "æ?°å¢?"
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr "è¿?å??"
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "é??é??"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
-msgstr "å??å?? Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
+msgstr ""
 
 #: ../tailsgreeter/language.py:119
 msgid "default:LTR"
diff --git a/zu/zu.po b/zu/zu.po
index 4d302a6..694487f 100644
--- a/zu/zu.po
+++ b/zu/zu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 10:47+0100\n"
+"POT-Creation-Date: 2017-03-17 13:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>, 2016\n"
 "Language-Team: Zulu (https://www.transifex.com/otf/teams/1519/zu/)\n"
@@ -82,7 +82,7 @@ msgstr ""
 msgid "Don't spoof MAC addresses"
 msgstr ""
 
-#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514
+#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:523
 msgid "Cannot unlock encrypted storage with this passphrase."
 msgstr ""
 
@@ -116,23 +116,23 @@ msgid "Save Language & Region Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:25
-msgid "Language"
+msgid "_Language"
 msgstr ""
 
 #: ../data/greeter.ui.h:26
-msgid "Keyboard Layout"
+msgid "_Keyboard Layout"
 msgstr ""
 
 #: ../data/greeter.ui.h:27
-msgid "Formats"
+msgid "_Formats"
 msgstr ""
 
 #: ../data/greeter.ui.h:28
-msgid "Time Zone"
+msgid "_Time Zone"
 msgstr ""
 
 #: ../data/greeter.ui.h:29
-msgid "Encrypted Persistent Storage"
+msgid "Encrypted _Persistent Storage"
 msgstr ""
 
 #: ../data/greeter.ui.h:30
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Enter your passphrase to unlock the persistent storage"
 msgstr ""
 
-#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460
-#: ../tailsgreeter/gui.py:510
+#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:469
+#: ../tailsgreeter/gui.py:519
 msgid "Unlock"
 msgstr ""
 
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
 msgstr ""
 
-#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554
-msgid "Additional Settings"
+#: ../data/greeter.ui.h:36
+msgid "_Additional Settings"
 msgstr ""
 
 #: ../data/greeter.ui.h:37
@@ -202,55 +202,71 @@ msgid ""
 msgstr ""
 
 #: ../data/greeter.ui.h:45
-msgid "Off (default)"
+msgid "_Administration Password"
 msgstr ""
 
 #: ../data/greeter.ui.h:46
-msgid "On (default)"
+msgid "Off (default)"
 msgstr ""
 
 #: ../data/greeter.ui.h:47
-msgid "Network Connection"
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: ../data/greeter.ui.h:48
+msgid "On (default)"
 msgstr ""
 
-#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367
+#: ../data/greeter.ui.h:49
+msgid "_Network Connection"
+msgstr ""
+
+#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:376
 msgid "Direct (default)"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:373
+#: ../data/greeter.ui.h:51
+msgid "_Windows Camouflage"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:382
 msgid "Bridge & Proxy"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:379
+#: ../tailsgreeter/gui.py:388
 msgid "Offline"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:463
+#: ../tailsgreeter/gui.py:472
 msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: ../tailsgreeter/gui.py:481
+#: ../tailsgreeter/gui.py:490
 msgid "Unlockingâ?¦"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:562
+#: ../tailsgreeter/gui.py:563
+msgid "Additional Settings"
+msgstr ""
+
+#: ../tailsgreeter/gui.py:571
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../tailsgreeter/gui.py:566
+#: ../tailsgreeter/gui.py:577
 msgid "Add"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:572
+#: ../tailsgreeter/gui.py:585
 msgid "Back"
 msgstr ""
 
-#: ../tailsgreeter/gui.py:658
+#: ../tailsgreeter/gui.py:696
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: ../tailsgreeter/gui.py:664
-msgid "Start Tails"
+#: ../tailsgreeter/gui.py:701
+msgid "_Start Tails"
 msgstr ""
 
 #: ../tailsgreeter/language.py:119

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

Prev by Author: [tor-commits] [translation/whisperback_completed] Update translations for whisperback_completed
Next by Author: [tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties
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